Skip to content

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

1.流程改为跳转页面 

2.//todo  回款管理的客户接口
上级 3ab62ce3
显示空白字符变更
内嵌 并排
正在显示 包含 268 行增加 和 11 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ ba5f5cd4
......@@ -2224,6 +2224,15 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.store.ChooseProcessActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
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/bean/ProcessBean.java
浏览文件 @ ba5f5cd4
......@@ -48,6 +48,7 @@ public class ProcessBean {
private String deptName;
private String sendStockTypeName;
private String sendStockName;
private String returnStockName;
private String createdByName;
private String code;
......@@ -56,6 +57,7 @@ public class ProcessBean {
private int current;
private String processName;
private String usedStockTypeName;
private String usedStockName;
private int inStockId;
private String createdTime;
private String ofDefault;
......@@ -80,6 +82,23 @@ public class ProcessBean {
private String searchValue;
private String status;
public String getSendStockName() {
return sendStockName;
}
public void setSendStockName(String sendStockName) {
this.sendStockName = sendStockName;
}
public String getUsedStockName() {
return usedStockName;
}
public void setUsedStockName(String usedStockName) {
this.usedStockName = usedStockName;
}
public String getDeptName() {
return deptName;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/ChooseInfoActivity.java
浏览文件 @ ba5f5cd4
......@@ -395,11 +395,13 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
toast("请先选择客户");
return;
}
if (processList.size() == 0) {
toast("没有数据哦");
return;
}
processDialog.show();
// if (processList.size() == 0) {
// toast("没有数据哦");
// return;
// }
// processDialog.show();
startActivityForResult(ChooseProcessActivity.class, 10003,
"processCode",permissionCode,"transitPartId",clientId.toString());
break;
case "2":
if (!WorkUtils.hasPermission(PagePermissionType.SUB_PROCESS.getPermission())) {
......@@ -410,11 +412,13 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
toast("请先选择客户");
return;
}
if (processList.size() == 0) {
toast("没有数据哦");
return;
}
processDialog.show();
// if (processList.size() == 0) {
// toast("没有数据哦");
// return;
// }
// processDialog.show();
startActivityForResult(ChooseProcessActivity.class, 10003,
"processCode",permissionCode,"transitPartId",clientId.toString());
break;
case "3":
if (supplyId == null) {
......@@ -507,6 +511,12 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
}
}
break;
case 10003:
if (resultCode == 10003) {
chooseProcess = JSON.parseObject(data.getStringExtra("process"),ProcessBean.class);
tvCommonContent.setText(chooseProcess.getName());
}
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/ChooseProcessActivity.java 0 → 100644
浏览文件 @ ba5f5cd4
package com.wd.workoffice.ui.activity.bat.store;
import android.content.Intent;
import android.view.View;
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.bean.ProcessBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ProcessAdapter;
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 ChooseProcessActivity extends WorkToolBarActivity {
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private List<ProcessBean> dataList;
private ProcessAdapter dataAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new ProcessAdapter(R.layout.item_process, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content,rvData);
getData();
}
private void getData() {
RtfUtils.getRtf().getProcess(getIntent().getStringExtra("processCode"), Integer.valueOf( getIntent().getStringExtra("transitPartId"))).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<ProcessBean> getList = JSON.parseArray(data.getData().toString(), ProcessBean.class);
dataList.clear();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
dataAdapter.loadMoreComplete();
}
});
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(new OnRefreshListener() {
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
getData();
}
});
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent =new Intent();
intent.putExtra("process",JSON.toJSONString(dataList.get(position)));
setResult(10003,intent);
finish();
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_pro_price;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/login/ErpActivationOneActivity.java
浏览文件 @ ba5f5cd4
......@@ -140,7 +140,7 @@ public class ErpActivationOneActivity extends WorkToolBarActivity implements Erp
@Override
public void getInfo(ActivationUserBean data) {
infoData = data;
etName.setText(data.getUserName());
etName.setText(data.getNickName());
etStaffCode.setText(data.getErpId());
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/ProcessAdapter.java 0 → 100644
浏览文件 @ ba5f5cd4
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 com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.util.MathUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class ProcessAdapter extends BaseQuickAdapter<ProcessBean, BaseViewHolder> {
public ProcessAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, ProcessBean item) {
helper.setText(R.id.tv_process_name, item.getName());
helper.setText(R.id.tv_stock1, item.getInStockName());
helper.setText(R.id.tv_stock2, item.getSendStockName());
helper.setText(R.id.tv_stock3, item.getUsedStockName());
helper.setText(R.id.tv_stock4, item.getReturnStockName());
}
}
app/src/main/res/layout/item_process.xml 0 → 100644
浏览文件 @ ba5f5cd4
<?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="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="10mm">
<TextView
android:id="@+id/tv_process_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="16sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:background="#FCFCFD"
android:orientation="vertical"
android:padding="10mm">
<TextView
android:id="@+id/tv_stock1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_stock2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginTop="10mm"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_stock3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginTop="10mm"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_stock4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginTop="10mm"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论