Skip to content
项目
Groups
代码片段
帮助
正在加载...
Sign in / Register
Toggle navigation
W
workoffice
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图表
统计图
Create a new issue
作业
提交
议题看板
Open sidebar
冷广德
workoffice
Commits
d17b5f33
提交
d17b5f33
authored
6月 06, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.设备维修
2.//TODO 坩埚下单,mes其他页面,mes用户反馈空也展示,编辑任务担当无法修改
上级
4d0feb33
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
8 行增加
和
7 行删除
+8
-7
DeviceBuyRepairAddActivity.java
...fice/ui/activity/bat/work/DeviceBuyRepairAddActivity.java
+1
-0
DeviceRepairDetailActivity.java
...fice/ui/activity/bat/work/DeviceRepairDetailActivity.java
+3
-2
DeviceRepairAdapter.java
...ava/com/wd/workoffice/ui/adapter/DeviceRepairAdapter.java
+2
-1
DeviceRepairCheckFragment.java
...va/com/wd/workoffice/ui/fg/DeviceRepairCheckFragment.java
+1
-1
DeviceRepairFragment.java
...in/java/com/wd/workoffice/ui/fg/DeviceRepairFragment.java
+1
-1
DeviceRepairListFragment.java
...ava/com/wd/workoffice/ui/fg/DeviceRepairListFragment.java
+0
-2
没有找到文件。
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyRepairAddActivity.java
浏览文件 @
d17b5f33
...
@@ -70,6 +70,7 @@ public class DeviceBuyRepairAddActivity extends WorkToolBarActivity {
...
@@ -70,6 +70,7 @@ public class DeviceBuyRepairAddActivity extends WorkToolBarActivity {
protected
void
initView
()
{
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
ButterKnife
.
bind
(
this
);
depDialog
=
DialogUtils
.
listDialog
(
this
);
depDialog
=
DialogUtils
.
listDialog
(
this
);
WorkUtils
.
addDecimalsListener
(
etPrice
);
}
}
@Override
@Override
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceRepairDetailActivity.java
浏览文件 @
d17b5f33
...
@@ -24,6 +24,7 @@ import com.wd.workoffice.retrofit.RtfUtils;
...
@@ -24,6 +24,7 @@ import com.wd.workoffice.retrofit.RtfUtils;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.DeviceDetailAdapter
;
import
com.wd.workoffice.ui.adapter.DeviceDetailAdapter
;
import
com.wd.workoffice.util.DialogUtils
;
import
com.wd.workoffice.util.DialogUtils
;
import
com.wd.workoffice.util.MathUtils
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.util.WorkUtils
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.EventBus
;
...
@@ -102,7 +103,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
...
@@ -102,7 +103,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
tvOrderPeople
.
setText
(
info
.
getLaunchUserName
());
tvOrderPeople
.
setText
(
info
.
getLaunchUserName
());
tvOrderDep
.
setText
(
info
.
getLaunchDeptName
());
tvOrderDep
.
setText
(
info
.
getLaunchDeptName
());
tvOrderTime
.
setText
(
info
.
getCreatedTime
());
tvOrderTime
.
setText
(
info
.
getCreatedTime
());
tvPrice
.
setText
(
info
.
getCreatedTime
(
));
tvPrice
.
setText
(
MathUtils
.
converData
(
info
.
getLaunchOrderAmount
(),
3
));
tvRemark
.
setText
(
info
.
getRemark
());
tvRemark
.
setText
(
info
.
getRemark
());
changePermissionView
();
changePermissionView
();
dataList
=
new
ArrayList
<>();
dataList
=
new
ArrayList
<>();
...
@@ -114,7 +115,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
...
@@ -114,7 +115,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
private
void
changePermissionView
()
{
private
void
changePermissionView
()
{
if
(
TextUtils
.
equals
(
"0"
,
getIntent
().
getStringExtra
(
"from"
)))
{
if
(
!
TextUtils
.
equals
(
"0"
,
getIntent
().
getStringExtra
(
"from"
)))
{
llBottom
.
setVisibility
(
View
.
GONE
);
llBottom
.
setVisibility
(
View
.
GONE
);
return
;
return
;
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/DeviceRepairAdapter.java
浏览文件 @
d17b5f33
...
@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
...
@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.bean.OrderBean
;
import
com.wd.workoffice.bean.OrderBean
;
import
com.wd.workoffice.bean.RepairBean
;
import
com.wd.workoffice.bean.RepairBean
;
import
com.wd.workoffice.util.MathUtils
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.util.WorkUtils
;
import
java.util.List
;
import
java.util.List
;
...
@@ -30,7 +31,7 @@ public class DeviceRepairAdapter extends BaseQuickAdapter<RepairBean.RecordsBean
...
@@ -30,7 +31,7 @@ public class DeviceRepairAdapter extends BaseQuickAdapter<RepairBean.RecordsBean
helper
.
setText
(
R
.
id
.
tv_order_time
,
item
.
getCreatedTime
());
helper
.
setText
(
R
.
id
.
tv_order_time
,
item
.
getCreatedTime
());
helper
.
setText
(
R
.
id
.
tv_repair_time
,
item
.
getRepairDateTime
());
helper
.
setText
(
R
.
id
.
tv_repair_time
,
item
.
getRepairDateTime
());
helper
.
setText
(
R
.
id
.
tv_status
,
WorkUtils
.
getDeviceStatus
(
item
.
getStatus
()));
helper
.
setText
(
R
.
id
.
tv_status
,
WorkUtils
.
getDeviceStatus
(
item
.
getStatus
()));
helper
.
setText
(
R
.
id
.
tv_all_price
,
String
.
valueOf
(
item
.
getAmount
()
));
helper
.
setText
(
R
.
id
.
tv_all_price
,
MathUtils
.
converData
(
item
.
getAmount
(),
3
));
}
}
}
}
app/src/main/java/com/wd/workoffice/ui/fg/DeviceRepairCheckFragment.java
浏览文件 @
d17b5f33
...
@@ -18,7 +18,7 @@ import butterknife.BindView;
...
@@ -18,7 +18,7 @@ import butterknife.BindView;
import
butterknife.ButterKnife
;
import
butterknife.ButterKnife
;
/**
/**
*
销售 - 供应订单
*
设备维修列表
* author : flexible
* author : flexible
* email : lgd19940421@163.com
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
* github: https://github.com/FlexibleXd
...
...
app/src/main/java/com/wd/workoffice/ui/fg/DeviceRepairFragment.java
浏览文件 @
d17b5f33
...
@@ -18,7 +18,7 @@ import butterknife.BindView;
...
@@ -18,7 +18,7 @@ import butterknife.BindView;
import
butterknife.ButterKnife
;
import
butterknife.ButterKnife
;
/**
/**
*
销售 - 供应订单
*
设备维修列表
* author : flexible
* author : flexible
* email : lgd19940421@163.com
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
* github: https://github.com/FlexibleXd
...
...
app/src/main/java/com/wd/workoffice/ui/fg/DeviceRepairListFragment.java
浏览文件 @
d17b5f33
...
@@ -58,7 +58,6 @@ public class DeviceRepairListFragment extends WorkBaseFg {
...
@@ -58,7 +58,6 @@ public class DeviceRepairListFragment extends WorkBaseFg {
private
Map
<
String
,
Object
>
param
;
private
Map
<
String
,
Object
>
param
;
private
DeviceRepairAdapter
dataAdapter
;
private
DeviceRepairAdapter
dataAdapter
;
private
List
<
RepairBean
.
RecordsBean
>
dataList
;
private
List
<
RepairBean
.
RecordsBean
>
dataList
;
private
String
identity
;
@Override
@Override
protected
void
initView
()
{
protected
void
initView
()
{
...
@@ -88,7 +87,6 @@ public class DeviceRepairListFragment extends WorkBaseFg {
...
@@ -88,7 +87,6 @@ public class DeviceRepairListFragment extends WorkBaseFg {
Bundle
arguments
=
getArguments
();
Bundle
arguments
=
getArguments
();
if
(
arguments
!=
null
)
{
if
(
arguments
!=
null
)
{
state
=
arguments
.
getString
(
"state"
);
state
=
arguments
.
getString
(
"state"
);
identity
=
arguments
.
getString
(
"identity"
);
}
}
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论