Skip to content

W
workoffice
提交 e63d2f41 authored 作者: flexiblexd@163.com's avatar flexiblexd@163.com
浏览文件
操作

1.mes杂七杂八

上级 c37bc3d0
隐藏空白字符变更
内嵌 并排
正在显示 包含 718 行增加 和 68 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/TicketBean.java
浏览文件 @ e63d2f41
......@@ -89,6 +89,15 @@ public class TicketBean extends BaseMesPageBean {
private int jobStatus;
private Object remark;
private boolean delete;
private String closingInstructions;
public String getClosingInstructions() {
return closingInstructions;
}
public void setClosingInstructions(String closingInstructions) {
this.closingInstructions = closingInstructions;
}
public String getId() {
return id;
......
app/src/main/java/com/wd/workoffice/bean/mesBean/UserDataDetailBean.java
浏览文件 @ e63d2f41
......@@ -260,8 +260,8 @@ public class UserDataDetailBean {
private String id;
private Object isDelete;
private Object createDateTime;
private Object updateDateTime;
private long createDateTime;
private long updateDateTime;
private String feedbackInfoNo;
private String customerUserCode;
private String customerUserName;
......@@ -272,7 +272,7 @@ public class UserDataDetailBean {
private String steelmakingInfoCode;
private Object feedbackDateTime;
private String createUserId;
private Object createUserName;
private String createUserName;
private String updateUserId;
private String updateUserName;
private boolean isCustomerArchives;
......@@ -317,19 +317,19 @@ public class UserDataDetailBean {
this.isDelete = isDelete;
}
public Object getCreateDateTime() {
public long getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(Object createDateTime) {
public void setCreateDateTime(long createDateTime) {
this.createDateTime = createDateTime;
}
public Object getUpdateDateTime() {
public long getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(Object updateDateTime) {
public void setUpdateDateTime(long updateDateTime) {
this.updateDateTime = updateDateTime;
}
......@@ -413,11 +413,11 @@ public class UserDataDetailBean {
this.createUserId = createUserId;
}
public Object getCreateUserName() {
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(Object createUserName) {
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ e63d2f41
......@@ -147,6 +147,16 @@ public interface MesApiService {
@POST("/himes/api/msWorkOrder/accept.json")
Observable<BaseMesBean> receiveTicket(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 工作总结新增
*
* @return
*/
@POST("/himes/api/msWorkOrder/show/closeJob.json")
Observable<BaseMesBean> closeJob(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 产品
*
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/history/HistoryDetailActivity.java
浏览文件 @ e63d2f41
package com.wd.workoffice.ui.activity.mes.history;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.blankj.utilcode.util.TimeUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.event.ModifyUserDataEvent;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
......@@ -27,7 +23,6 @@ import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.mes.user.MesMiddleAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesMiddleDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesOtherSupplierAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesOtherSupplierDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesPackageAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesPackageDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesSpeedAddActivity;
......@@ -37,22 +32,16 @@ import com.wd.workoffice.ui.activity.mes.user.MesStockDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesSupplierActivity;
import com.wd.workoffice.ui.activity.mes.user.MesSupplierAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesThreeAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesThreeDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesUserDataDetailModifyActivity;
import com.wd.workoffice.ui.adapter.UserDataAdd3Adapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter;
import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
......@@ -194,6 +183,18 @@ public class HistoryDetailActivity extends WorkToolBarActivity {
RecyclerView rvData7;
@BindView(R.id.tv_add7)
TextView tvAdd7;
@BindView(R.id.tv_check_name)
TextView tvCheckName;
@BindView(R.id.tv_check_time)
TextView tvCheckTime;
@BindView(R.id.tv_make_name)
TextView tvMakeName;
@BindView(R.id.tv_make_time)
TextView tvMakeTime;
@BindView(R.id.tv_update_name)
TextView tvUpdateName;
@BindView(R.id.tv_update_time)
TextView tvUpdateTime;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -314,6 +315,13 @@ public class HistoryDetailActivity extends WorkToolBarActivity {
tvClient.setText(mainInfo.getCustomerUserName());
tvManager.setText(mainInfo.getSalesManagerName());
tvSale.setText(mainInfo.getSalesCompanyName());
tvCheckName.setText(mainInfo.getApprovalUserName());
tvCheckTime.setText(TimeUtils.millis2String(mainInfo.getApprovalDateTime()));
tvUpdateName.setText(mainInfo.getUpdateUserName());
tvUpdateTime.setText(TimeUtils.millis2String(mainInfo.getUpdateDateTime()));
tvMakeName.setText(mainInfo.getCreateUserName());
tvMakeTime .setText(TimeUtils.millis2String(mainInfo.getCreateDateTime()));
// if (TextUtils.equals("1", getIntent().getStringExtra("from"))) {
// if (mainInfo.getApprovalStatus() != 0) {
// llBottom.setVisibility(View.GONE);
......@@ -341,9 +349,9 @@ public class HistoryDetailActivity extends WorkToolBarActivity {
private void getFactoryData(String code) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("steelmakingWorksCode", code);
param.put("feedbackInfoNo", getIntent().getStringExtra("feedback"));
param.put("feedbackInfoNo", getIntent().getStringExtra("feedback"));
param.put("msVersion", getIntent().getStringExtra("version"));
RtfUtils.getMesRtf().historySteelList ("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
RtfUtils.getMesRtf().historySteelList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......@@ -391,7 +399,7 @@ public class HistoryDetailActivity extends WorkToolBarActivity {
private void getMachineData(String code) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("continuousCasterCode", code);
param.put("feedbackInfoNo", getIntent().getStringExtra("feedback"));
param.put("feedbackInfoNo", getIntent().getStringExtra("feedback"));
param.put("msVersion", getIntent().getStringExtra("version"));
RtfUtils.getMesRtf().historyCasterList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
......@@ -495,7 +503,7 @@ public class HistoryDetailActivity extends WorkToolBarActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(HistoryThreeDetailActivity.class,
"id", machineDetailBean.getProductList().get(position).getId()
,"version", getIntent().getStringExtra("version"),
, "version", getIntent().getStringExtra("version"),
"feedback", getIntent().getStringExtra("feedback"));
}
});
......@@ -510,7 +518,7 @@ public class HistoryDetailActivity extends WorkToolBarActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(HistoryOtherSupplierDetailActivity.class,
"id", machineDetailBean.getOtherSupList().get(position).getId()
,"version", getIntent().getStringExtra("version"),
, "version", getIntent().getStringExtra("version"),
"feedback", getIntent().getStringExtra("feedback"));
}
});
......@@ -519,7 +527,7 @@ public class HistoryDetailActivity extends WorkToolBarActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesPackageDetailActivity.class,
"id", machineDetailBean.getOtherLadleList().get(position).getId()
,"version", getIntent().getStringExtra("version"),
, "version", getIntent().getStringExtra("version"),
"feedback", getIntent().getStringExtra("feedback"));
}
});
......@@ -644,5 +652,4 @@ public class HistoryDetailActivity extends WorkToolBarActivity {
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailActivity.java
浏览文件 @ e63d2f41
package com.wd.workoffice.ui.activity.mes.ticket;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.event.AddSummarytEvent;
import com.wd.workoffice.bean.event.AddTicketEvent;
import com.wd.workoffice.bean.mesBean.JobTypeBean;
......@@ -19,6 +23,8 @@ 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.JobTypeAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
......@@ -84,6 +90,10 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
RelativeLayout rlLog;
@BindView(R.id.rl_add_log)
RelativeLayout rlAddLog;
@BindView(R.id.tv_close_desc)
TextView tvCloseDesc;
@BindView(R.id.ll_close)
LinearLayout llClose;
private TicketBean.ListBean data;
private Map<String, Object> param;
......@@ -106,13 +116,13 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
}
}
}
if (data.getJobStatus() ==2) {
if (data.getJobStatus() == 2) {
rlLog.setVisibility(View.GONE);
rlAddLog.setVisibility(View.VISIBLE);
} else if (data.getJobStatus()>2){
} else if (data.getJobStatus() > 2) {
rlLog.setVisibility(View.VISIBLE);
rlAddLog.setVisibility(View.GONE);
}else {
} else {
rlLog.setVisibility(View.GONE);
rlAddLog.setVisibility(View.GONE);
}
......@@ -129,6 +139,13 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
tvCreatePerson.setText(data.getCreateUserName());
tvTime.setText(data.getCreateDateTime());
tvTakeOn.setText(data.getJobUserName());
if (data.getJobStatus() == 9) {
rlLog.setVisibility(View.GONE);
rlAddLog.setVisibility(View.GONE);
llBottom.setVisibility(View.GONE);
llClose.setVisibility(View.VISIBLE);
tvCloseDesc.setText(data.getClosingInstructions());
}
}
private void getType(String id) {
......@@ -246,4 +263,86 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
public void refresh(AddSummarytEvent event) {
finish();
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals(data.getCreateUserId(), UserKeeper.getInstance().getMesUid())
&& data.getJobStatus() != 9)
getMenuInflater().inflate(R.menu.menu_close, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.close:
closeDialog();
break;
}
return super.onOptionsItemSelected(item);
}
private void close(String content) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("closingInstructions", content);
param.put("id", data.getId());
param.put("beforeStatus", data.getJobStatus());
RtfUtils.getMesRtf().closeJob("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("关闭成功");
EventBus.getDefault().post(new AddTicketEvent());
}
});
}
private void closeDialog() {
QMUIDialog.CustomDialogBuilder msg = DialogUtils.customDialog(this);
msg.setLayout(R.layout.view_close_job);
QMUIDialog qmuiDialog = msg.create();
qmuiDialog.setCancelable(false);
EditText etContent = qmuiDialog.findViewById(R.id.et_content);
Button btnCancel = qmuiDialog.findViewById(R.id.btn_cancel);
Button btnOk = qmuiDialog.findViewById(R.id.btn_ok);
btnOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String content = etContent.getText().toString();
if (TextUtils.isEmpty(content)) {
toast("请输入关闭原因");
return;
}
close(content);
qmuiDialog.dismiss();
}
});
btnCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
qmuiDialog.dismiss();
finish();
}
});
qmuiDialog.show();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailFinishActivity.java
浏览文件 @ e63d2f41
......@@ -2,6 +2,8 @@ package com.wd.workoffice.ui.activity.mes.ticket;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
......@@ -11,6 +13,7 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
......@@ -22,6 +25,8 @@ import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ImgAdapter;
import com.wd.workoffice.ui.adapter.StarAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
......@@ -320,4 +325,84 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals(data.getCreateUserId(), UserKeeper.getInstance().getMesUid())
&& data.getJobStatus() != 9)
getMenuInflater().inflate(R.menu.menu_close, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.close:
closeDialog();
break;
}
return super.onOptionsItemSelected(item);
}
private void close(String content) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("content",content);
param.put("id",data.getId());
param.put("beforeStatus",data.getJobStatus());
RtfUtils.getMesRtf().closeJob("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("关闭成功");
EventBus.getDefault().post(new AddTicketEvent());
}
});
}
private void closeDialog() {
QMUIDialog.CustomDialogBuilder msg = DialogUtils.customDialog(this);
msg.setLayout(R.layout.view_close_job);
QMUIDialog qmuiDialog = msg.create();
qmuiDialog.setCancelable(false);
EditText etContent = qmuiDialog.findViewById(R.id.et_content);
Button btnCancel = qmuiDialog.findViewById(R.id.btn_cancel);
Button btnOk = qmuiDialog.findViewById(R.id.btn_ok);
btnOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String content = etContent.getText().toString();
if (TextUtils.isEmpty(content)){
toast("请输入关闭原因");
return;
}
close(content);
qmuiDialog.dismiss();
}
});
btnCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
qmuiDialog.dismiss();
finish();
}
});
qmuiDialog.show();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailReviewActivity.java
浏览文件 @ e63d2f41
......@@ -2,16 +2,21 @@ package com.wd.workoffice.ui.activity.mes.ticket;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddTicketEvent;
import com.wd.workoffice.bean.mesBean.ImageBean;
import com.wd.workoffice.bean.mesBean.ReviewBean;
import com.wd.workoffice.bean.mesBean.SummaryBean;
......@@ -20,10 +25,15 @@ import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ImgAdapter;
import com.wd.workoffice.ui.adapter.StarAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
......@@ -237,7 +247,7 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
llTech.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(data.getJobTypeId(), "05")) {
llTender.setVisibility(View.VISIBLE);
}else {
} else {
// rlFinish.setVisibility(View.GONE);
}
}
......@@ -251,4 +261,85 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals(data.getCreateUserId(), UserKeeper.getInstance().getMesUid())
&& data.getJobStatus() != 9)
getMenuInflater().inflate(R.menu.menu_close, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.close:
closeDialog();
break;
}
return super.onOptionsItemSelected(item);
}
private void close(String content) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("content", content);
param.put("id", data.getId());
param.put("beforeStatus", data.getJobStatus());
RtfUtils.getMesRtf().closeJob("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("关闭成功");
EventBus.getDefault().post(new AddTicketEvent());
}
});
}
private void closeDialog() {
QMUIDialog.CustomDialogBuilder msg = DialogUtils.customDialog(this);
msg.setLayout(R.layout.view_close_job);
QMUIDialog qmuiDialog = msg.create();
qmuiDialog.setCancelable(false);
EditText etContent = qmuiDialog.findViewById(R.id.et_content);
Button btnCancel = qmuiDialog.findViewById(R.id.btn_cancel);
Button btnOk = qmuiDialog.findViewById(R.id.btn_ok);
btnOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String content = etContent.getText().toString();
if (TextUtils.isEmpty(content)) {
toast("请输入关闭原因");
return;
}
close(content);
qmuiDialog.dismiss();
}
});
btnCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
qmuiDialog.dismiss();
finish();
}
});
qmuiDialog.show();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java
浏览文件 @ e63d2f41
......@@ -187,6 +187,14 @@ public class MesTicketListActivity extends WorkToolBarActivity {
case 4:
startActivity(MesTicketDetailReviewActivity.class, "from", isJob ? "1" : "0", "data", JSON.toJSONString(dataList.get(position)),"permission",permission == null ? "" :permission.toJSONString());
break;
case 5:
startActivity(MesTicketDetailActivity.class,
"from", isJob ? "1" : "0", "data", JSON.toJSONString(dataList.get(position)),"permission",permission == null ? "" :permission.toJSONString());
break;
case 9:
startActivity(MesTicketDetailActivity.class,
"from", isJob ? "1" : "0", "data", JSON.toJSONString(dataList.get(position)),"permission",permission == null ? "" :permission.toJSONString());
break;
}
}
});
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ e63d2f41
package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.Menu;
......@@ -13,6 +14,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.blankj.utilcode.util.TimeUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
......@@ -45,7 +47,6 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
/**
......@@ -181,6 +182,18 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
RecyclerView rvData7;
@BindView(R.id.tv_add7)
TextView tvAdd7;
@BindView(R.id.tv_check_name)
TextView tvCheckName;
@BindView(R.id.tv_check_time)
TextView tvCheckTime;
@BindView(R.id.tv_make_name)
TextView tvMakeName;
@BindView(R.id.tv_make_time)
TextView tvMakeTime;
@BindView(R.id.tv_update_name)
TextView tvUpdateName;
@BindView(R.id.tv_update_time)
TextView tvUpdateTime;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -330,6 +343,16 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
tvClient.setText(mainInfo.getCustomerUserName());
tvManager.setText(mainInfo.getSalesManagerName());
tvSale.setText(mainInfo.getSalesCompanyName());
tvCheckName.setText(mainInfo.getApprovalUserName());
tvCheckTime.setText(TimeUtils.millis2String(mainInfo.getApprovalDateTime()));
tvUpdateName.setText(mainInfo.getUpdateUserName());
tvUpdateTime.setText(TimeUtils.millis2String(mainInfo.getUpdateDateTime()));
tvMakeName.setText(mainInfo.getCreateUserName());
tvMakeTime .setText(TimeUtils.millis2String(mainInfo.getCreateDateTime()));
if (TextUtils.equals("1", getIntent().getStringExtra("from"))) {
if (mainInfo.getApprovalStatus() != 0) {
llBottom.setVisibility(View.GONE);
......
app/src/main/java/com/wd/workoffice/util/WorkUtils.java
浏览文件 @ e63d2f41
......@@ -323,7 +323,7 @@ public class WorkUtils {
return name;
}
// 0草稿、1已提交、2执行中、3已总结、4已评价
// 0草稿、1已提交、2执行中、3已总结、4已评价 、9已关闭
public static String getTicketStatus(Integer code) {
String name = "";
switch (code) {
......@@ -342,6 +342,9 @@ public class WorkUtils {
case 4:
name = "已评价";
break;
case 9:
name = "已关闭";
break;
}
return name;
}
......
app/src/main/res/layout/activity_mes_ticket_detail.xml
浏览文件 @ e63d2f41
......@@ -243,7 +243,9 @@
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -431,6 +433,36 @@
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<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_close_desc"
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:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
app/src/main/res/layout/activity_mes_user_data_detail.xml
浏览文件 @ e63d2f41
......@@ -11,9 +11,8 @@
android:layout_alignParentBottom="true"
android:background="@color/white"
android:gravity="center"
android:visibility="gone"
android:paddingVertical="10mm"
>
android:visibility="gone">
<Button
android:id="@+id/btn_refuse"
......@@ -288,16 +287,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:id="@+id/tv_factory_desc1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="炼钢炉"
android:visibility="gone"
android:textSize="15sp" />
android:textSize="15sp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
......@@ -307,21 +305,19 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:id="@+id/tv_factory_desc2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="精炼炉"
android:visibility="gone"
android:textSize="15sp" />
android:textSize="15sp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
......@@ -343,8 +339,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="钢包"
android:visibility="gone"
android:textSize="15sp" />
android:textSize="15sp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
......@@ -374,6 +370,7 @@
android:src="@mipmap/mes_modify" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -401,6 +398,7 @@
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -457,12 +455,12 @@
<View style="@style/dividerX" />
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
android:paddingVertical="9mm"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......@@ -484,12 +482,12 @@
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
android:paddingVertical="9mm"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......@@ -596,12 +594,12 @@
</RelativeLayout>
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
android:paddingLeft="25mm"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......@@ -746,10 +744,10 @@
android:id="@+id/tv_middle8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="number"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:inputType="number"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
......@@ -757,13 +755,13 @@
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:visibility="gone"
android:id="@+id/rl_cover"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
android:paddingVertical="9mm"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......@@ -783,13 +781,13 @@
<!--<View style="@style/dividerX" />-->
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_cover"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
android:paddingHorizontal="20mm"
android:visibility="gone">
<RelativeLayout
android:layout_width="match_parent"
......@@ -900,13 +898,13 @@
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:visibility="gone"
android:id="@+id/rl_protection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
android:paddingVertical="9mm"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......@@ -928,11 +926,11 @@
<LinearLayout
android:id="@+id/ll_protection"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
android:paddingHorizontal="20mm"
android:visibility="gone">
<RelativeLayout
android:layout_width="match_parent"
......@@ -1038,6 +1036,7 @@
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -1077,9 +1076,9 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:layout_marginTop="10mm"
android:paddingVertical="9mm">
<TextView
......@@ -1126,6 +1125,7 @@
android:layout_alignParentLeft="true"
android:text="供货记录"
android:textSize="15sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -1265,14 +1265,14 @@
<RelativeLayout
android:id="@+id/rl_add"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:layout_marginBottom="30mm"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
android:paddingVertical="9mm"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......@@ -1290,6 +1290,7 @@
android:text="+添加"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -1326,6 +1327,191 @@
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<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="18sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="审核人名称"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_check_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="审核时间"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_check_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="制单人名称"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_make_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="制单时间"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_make_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="更新人名称"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_update_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="更新时间"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_update_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/activity_mes_user_data_machine_detail.xml
浏览文件 @ e63d2f41
......@@ -966,7 +966,7 @@
android:id="@+id/tv_next"
android:layout_width="match_parent"
android:background="@color/blue_btn"
android:text="下一步"
android:text="新增用户数据信息"
android:textColor="@color/white"
android:gravity="center"
android:layout_height="40mm" />
......
app/src/main/res/layout/view_close_job.xml 0 → 100644
浏览文件 @ e63d2f41
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#d1f8f8f8"
android:orientation="vertical"
android:paddingBottom="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20mm"
android:paddingHorizontal="20mm">
<TextView
android:id="@+id/tv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:textColor="@color/flexible_text_color"
android:text="关闭原因"
android:textSize="17sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:gravity="center"
android:text="X"
android:textSize="22sp"
android:textStyle="bold"
android:visibility="gone" />
</RelativeLayout>
<EditText
android:id="@+id/et_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="10mm"
android:background="@drawable/shape_input_white"
android:textColor="@color/flexible_text_color"
android:gravity="top"
android:hint="请输入关闭原因"
android:minLines="4"
android:padding="5mm"
android:textSize="16sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="7mm"
android:gravity="center">
<Button
android:id="@+id/btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginRight="40mm"
android:textColor="@color/flexible_text_color"
android:background="@drawable/shape_dialog_pro_cancel"
android:paddingHorizontal="20mm"
android:text="取消" />
<Button
android:id="@+id/btn_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/shape_dialog_pro_cancel"
android:paddingHorizontal="20mm"
android:textColor="@color/flexible_text_color"
android:text="确定" />
</LinearLayout>
</LinearLayout>
app/src/main/res/menu/menu_close.xml 0 → 100644
浏览文件 @ e63d2f41
<?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/close"
android:title="关闭"
app:showAsAction="always" />
</menu>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论