Skip to content

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

1.修改bugclose上的接口 

2.//TODO (采购新增，新增维修的部门接口)，坩埚下单，下单时间选择器当前时间验证，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 1cb3c3b7
隐藏空白字符变更
内嵌 并排
正在显示 包含 315 行增加 和 61 行删除
app/src/main/java/com/wd/workoffice/bean/event/MsgReadEvent.java 0 → 100644
浏览文件 @ 40dff7a5
package com.wd.workoffice.bean.event;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MsgReadEvent {
public MsgReadEvent() {
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnAddActivity.java
浏览文件 @ 40dff7a5
......@@ -17,6 +17,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.CheckReturnEvent;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.retrofit.RtfUtils;
......@@ -266,19 +267,12 @@ public class ReturnAddActivity extends WorkToolBarActivity {
return;
}
toast("提交申请成功");
EventBus.getDefault().post(new CheckSendEvent());
EventBus.getDefault().post(new CheckReturnEvent());
finish();
}
});
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
@OnClick({R.id.tv_bottom, R.id.ll_type, R.id.ll_choose_stock})
public void onViewClicked(View view) {
......@@ -295,27 +289,4 @@ public class ReturnAddActivity extends WorkToolBarActivity {
}
}
// @Override
// protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
// super.onActivityResult(requestCode, resultCode, data);
// if (requestCode == 10001 && resultCode == 10001) {
// String clientName = data.getStringExtra("clientName");
// clientId = data.getIntExtra("id", 0);
// tvLogisticsCompany.setText(clientName);
// }
// }
// @Override
// public void onStart() {
// super.onStart();
// EventBus.getDefault().register(this);
// }
//
// @Override
// public void onStop() {
// super.onStop();
// EventBus.getDefault().unregister(this);
// }
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SendApplyAddActivity.java
浏览文件 @ 40dff7a5
......@@ -213,6 +213,11 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
String price = etLogisticsPrice.getText().toString();
String code = etLogisticsCode.getText().toString();
String remark = etRemark.getText().toString();
String time = tvTime.getText().toString();
if (TextUtils.isEmpty(time)) {
toast("请选择发货时间");
return;
}
if (TextUtils.isEmpty(price)) {
toast("请输入运费");
return;
......@@ -221,6 +226,10 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
toast("请输入快递单号");
return;
}
if (clientId == 0) {
toast("请选择物流公司");
return;
}
param.put("trackingNumber", code);
param.put("fareMoney", price);
param.put("applyRemark", remark);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/UseApplyActivity.java
浏览文件 @ 40dff7a5
......@@ -112,6 +112,7 @@ public class UseApplyActivity extends WorkToolBarActivity {
"num", getIntent().getStringExtra("num"),
"orderType", getIntent().getStringExtra("orderType"),
"productId", getIntent().getStringExtra("productId"),
"orderItemId", getIntent().getStringExtra("orderItemId"),
"simpleCode", getIntent().getStringExtra("simpleCode"),
"id", getIntent().getStringExtra("orderId"));
break;
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/UseApplyAddActivity.java
浏览文件 @ 40dff7a5
......@@ -60,6 +60,7 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
tvNum.setText(String.format("最大领用数量(%s)", getIntent().getStringExtra("num")));
param = new HashMap<>();
param.put("productId", getIntent().getStringExtra("productId"));
param.put("orderItemId", getIntent().getStringExtra("orderItemId"));
param.put("simpleCode", getIntent().getStringExtra("simpleCode"));
etImgCode.setText(getIntent().getStringExtra("simpleCode"));
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialDetailActivity.java
浏览文件 @ 40dff7a5
......@@ -74,6 +74,7 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
@Override
protected void initView() {
ButterKnife.bind(this);
changePermission();
dataBean = JSON.parseObject(getIntent().getStringExtra("detail"), MoneyOutBean.RecordsBean.class);
tvClient.setText(dataBean.getCreatedTime());
tvCode.setText(dataBean.getSerialNumber());
......@@ -87,6 +88,9 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
tvReviewTime.setText(dataBean.getUpdatedTime());
tvStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(dataBean.getStatus())));
tvTime.setText(dataBean.getCreatedTime());
if (!TextUtils.equals(dataBean.getStatus(),"0")){
llBottom.setVisibility(View.GONE);
}
param = WorkUtils.simpleParam();
param.put("id", dataBean.getId());
param.put("applyAmount", dataBean.getApplyAmount());
......@@ -94,7 +98,7 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
@Override
protected void initData() {
changePermission();
}
......@@ -128,6 +132,7 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
hasPermission = WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_EXAM.getPermission());
}
if (!hasPermission) {
llBottom.setVisibility(View.GONE);
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialOutActivity.java
浏览文件 @ 40dff7a5
package com.wd.workoffice.ui.activity.bat.work;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
......@@ -29,6 +34,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
......@@ -94,7 +100,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new WorkFinancialOutAdapter(R.layout.item_financial_out, dataList);
dataAdapter = new WorkFinancialOutAdapter(R.layout.item_financial_out, dataList,1);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
......@@ -169,9 +175,99 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
"type","1","detail",JSON.toJSONString(dataList.get(position)));
}
});
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
switch (view.getId()){
case R.id.btn_agree:
checkDialog(1,i);
break;
case R.id.btn_refuse:
checkDialog(2,i);
break;
}
}
});
}
private void checkDialog(int position, int status) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvDesc = view.findViewById(R.id.tv_desc);
tvDesc.setText(status == 1 ? "通过" : "拒绝");
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
tvNum.setText(s.length() + "/140");
}
});
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注");
return;
}
check(status, etRemark.getText().toString(),position);
addCartDialog.dismiss();
}
});
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
addCartDialog.dismiss();
}
});
addCartDialog.show();
}
private void check(int status, String remark, int position) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("status",status);
param.put("auditRemark",remark);
param.put("id", dataList.get(position).getId());
param.put("applyAmount", dataList.get(position).getApplyAmount());
RtfUtils.getRtf().checkMoneyBack(WorkUtils.convertMapToBody(this.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;
}
toast("操作成功");
dataList.get(position).setStatus("status");
dataAdapter.notifyItemChanged(position);
}
});
}
@Override
protected int layoutId() {
return R.layout.fg_work_pro;
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialPayActivity.java
浏览文件 @ 40dff7a5
package com.wd.workoffice.ui.activity.bat.work;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
......@@ -29,15 +34,17 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
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
......@@ -94,7 +101,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new WorkFinancialOutAdapter(R.layout.item_financial_out, dataList);
dataAdapter = new WorkFinancialOutAdapter(R.layout.item_financial_out, dataList,0);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
......@@ -166,7 +173,98 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialDetailActivity.class, "type", "2", "detail", JSON.toJSONString(dataList.get(position)));
}
});
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
switch (view.getId()){
case R.id.btn_agree:
checkDialog(i,1);
break;
case R.id.btn_refuse:
checkDialog(i,2);
break;
}
}
});
}
private void checkDialog(int position, int status) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvDesc = view.findViewById(R.id.tv_desc);
tvDesc.setText(status == 1 ? "通过" : "拒绝");
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
tvNum.setText(s.length() + "/140");
}
});
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注");
return;
}
check(status, etRemark.getText().toString(), position);
addCartDialog.dismiss();
}
});
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
addCartDialog.dismiss();
}
});
addCartDialog.show();
}
private void check(int status, String remark, int position) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("status",status);
param.put("auditRemark",remark);
param.put("id", dataList.get(position).getId());
param.put("applyAmount", dataList.get(position).getApplyAmount());
RtfUtils.getRtf().checkMoneyPay(WorkUtils.convertMapToBody(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;
}
toast("操作成功");
dataList.get(position).setStatus("status");
dataAdapter.notifyItemChanged(position);
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkInStockActivity.java
浏览文件 @ 40dff7a5
......@@ -38,6 +38,7 @@ import io.reactivex.disposables.Disposable;
/**
* 库存类别
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......@@ -59,7 +60,7 @@ public class WorkInStockActivity extends WorkToolBarActivity {
InSotckFilterData filterData = new InSotckFilterData(ddmChoose, new ThreeMenuClickListener() {
@Override
public void clickOne(String value) {
if (TextUtils.equals(value, "全部状态")) {
if (TextUtils.equals(value, "全部类型")) {
param.put("level", "");
} else if (TextUtils.equals(value, "一级库")) {
param.put("level", "1");
......@@ -81,7 +82,7 @@ public class WorkInStockActivity extends WorkToolBarActivity {
param.put("type", "OUT");
}
page = 1;
param.put("page", page);
param.put("current", page);
getData();
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockSearchActivity.java
浏览文件 @ 40dff7a5
......@@ -59,6 +59,7 @@ public class WorkWarehouseStockSearchActivity extends WorkBaseActivity {
rvData.setLayoutManager(new LinearLayoutManager(this,RecyclerView.VERTICAL,false));
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
etKey.setHint("搜索产品名称、品名、图号");
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkFinancialOutAdapter.java
浏览文件 @ 40dff7a5
package com.wd.workoffice.ui.adapter;
import android.text.TextUtils;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ContactsBean;
import com.wd.workoffice.bean.MoneyOutBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
......@@ -16,21 +20,40 @@ import java.util.List;
*/
public class WorkFinancialOutAdapter extends BaseQuickAdapter<MoneyOutBean.RecordsBean, BaseViewHolder> {
int type;
public WorkFinancialOutAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
public WorkFinancialOutAdapter(int layoutResId, List data, int type) {
super(layoutResId, data);
this.type = type;
}
@Override
protected void convert(BaseViewHolder helper,MoneyOutBean.RecordsBean item) {
helper.setText(R.id.tv_name,item.getSerialNumber());
helper.setText(R.id.tv_dep,item.getApplyDeptName());
helper.setText(R.id.tv_client,item.getCustomerName());
helper.setText(R.id.tv_process,item.getProcessName());
helper.setText(R.id.tv_order_type,item.getOrderTypeName());
helper.setText(R.id.tv_price,String.valueOf(item.getApplyAmount()));
protected void convert(BaseViewHolder helper, MoneyOutBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getSerialNumber());
helper.setText(R.id.tv_dep, item.getApplyDeptName());
helper.setText(R.id.tv_client, item.getCustomerName());
helper.setText(R.id.tv_process, item.getProcessName());
helper.setText(R.id.tv_order_type, item.getOrderTypeName());
helper.setText(R.id.tv_price, String.valueOf(item.getApplyAmount()));
helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus())));
boolean hasPermission;
if (type == 1) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_EXAM.getPermission());
} else {
hasPermission = WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_EXAM.getPermission());
}
if (TextUtils.equals("0", item.getStatus()) && hasPermission) {
helper.setGone(R.id.ll_check, true);
} else {
helper.setGone(R.id.ll_check, false);
}
helper.addOnClickListener(R.id.btn_agree);
helper.addOnClickListener(R.id.btn_refuse);
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkSendApplyAddAdapter.java
浏览文件 @ 40dff7a5
......@@ -38,9 +38,9 @@ public class WorkSendApplyAddAdapter extends BaseQuickAdapter<OrderDetail.OrderI
@Override
protected void convert(BaseViewHolder helper, OrderDetail.OrderItemsBean item) {
helper.setText(R.id.tv_name, item.getProductName());
helper.setText(R.id.tv_name, item.getProductSimpleCode());
helper.setText(R.id.tv_card, item.getProductSoleCode());
helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_card_name, item.getProductName ());
helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
// helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
......
app/src/main/java/com/wd/workoffice/ui/fg/MsgDetailFragment.java
浏览文件 @ 40dff7a5
......@@ -18,7 +18,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 销售 - 供应订单
* 消息子列表
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......
app/src/main/java/com/wd/workoffice/ui/fg/MsgListFragment.java
浏览文件 @ 40dff7a5
......@@ -13,6 +13,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.MsgBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.bean.event.MsgReadEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.MsgDetailActivity;
......@@ -146,6 +147,9 @@ public class MsgListFragment extends WorkBaseFg {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
msgRead(dataList.get(position).getId());
startActivity(MsgDetailActivity.class, "id", dataList.get(position).getId()+"");
dataList.remove(position);
dataAdapter.notifyItemRemoved(position);
EventBus.getDefault().post(new MsgReadEvent());
}
});
}
......@@ -161,14 +165,12 @@ public class MsgListFragment extends WorkBaseFg {
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
// toast(data.getMessage());
return;
}
}
......@@ -194,7 +196,10 @@ public class MsgListFragment extends WorkBaseFg {
}
@Subscribe
public void refresh(CheckOrderEvent event) {
public void refresh(MsgReadEvent event) {
if (!TextUtils.equals("type","readed")){
return;
}
page = 1;
param.put("current", page);
getData();
......
app/src/main/res/layout/activity_send_apply_add.xml
浏览文件 @ 40dff7a5
......@@ -101,7 +101,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="选择发货时间"
android:hint="选择发货时间"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
......
app/src/main/res/layout/activity_send_apply_detail.xml
浏览文件 @ 40dff7a5
......@@ -327,12 +327,12 @@
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
......@@ -346,10 +346,10 @@
android:id="@+id/tv_check_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
......
app/src/main/res/layout/item_financial_out.xml
浏览文件 @ 40dff7a5
......@@ -4,11 +4,11 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="10mm"
android:paddingTop="10mm"
android:paddingBottom="20mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="20mm">
<RelativeLayout
......@@ -39,9 +39,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:paddingVertical="10mm"
android:background="#FCFCFD"
android:orientation="vertical">
android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout
android:id="@+id/rl_dep"
android:layout_width="match_parent"
......@@ -66,6 +67,7 @@
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -90,6 +92,7 @@
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -139,6 +142,7 @@
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -164,4 +168,28 @@
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right">
<Button
android:id="@+id/btn_refuse"
android:layout_width="wrap_content"
android:layout_height="30mm"
android:text="拒绝"
android:textColor="@color/white"
android:background="@drawable/shape_blue_btn" />
<Button
android:id="@+id/btn_agree"
android:layout_width="wrap_content"
android:layout_height="30mm"
android:text="同意"
android:layout_marginLeft="10mm"
android:textColor="@color/white"
android:background="@drawable/shape_blue_btn" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论