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
899f2bd0
提交
899f2bd0
authored
6月 01, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.接单显示规则
2.//TODO (采购新增,设备采购-维修列表接口,新增维修的部门接口,接单显示规则),坩埚下单,下单时间选择器当前时间验证,mes其他页面,mes用户反馈空也展示,编辑任务担当无法修改
上级
1218c867
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
22 行增加
和
11 行删除
+22
-11
DeviceBuyDetailActivity.java
...koffice/ui/activity/bat/work/DeviceBuyDetailActivity.java
+13
-5
DeviceRepairDetailActivity.java
...fice/ui/activity/bat/work/DeviceRepairDetailActivity.java
+9
-5
UserKeeper.java
app/src/main/java/com/wd/workoffice/util/UserKeeper.java
+0
-1
没有找到文件。
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyDetailActivity.java
浏览文件 @
899f2bd0
...
@@ -26,6 +26,7 @@ import com.wd.workoffice.retrofit.RtfUtils;
...
@@ -26,6 +26,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.ui.adapter.SendApplyDetailAdapter
;
import
com.wd.workoffice.ui.adapter.SendApplyDetailAdapter
;
import
com.wd.workoffice.util.UserKeeper
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.util.WorkUtils
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.EventBus
;
...
@@ -100,6 +101,15 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
...
@@ -100,6 +101,15 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
tvOrderTime
.
setText
(
info
.
getCreatedTime
());
tvOrderTime
.
setText
(
info
.
getCreatedTime
());
tvPrice
.
setText
(
info
.
getCreatedTime
());
tvPrice
.
setText
(
info
.
getCreatedTime
());
tvRemark
.
setText
(
info
.
getRemark
());
tvRemark
.
setText
(
info
.
getRemark
());
changePermissionView
();
dataList
=
new
ArrayList
<>();
dataAdapter
=
new
DeviceDetailAdapter
(
R
.
layout
.
item_device_detail
,
dataList
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
param
=
new
HashMap
<>();
param
.
put
(
"id"
,
info
.
getId
());
}
private
void
changePermissionView
()
{
if
(
info
.
getStatus
()
==
100
)
{
if
(
info
.
getStatus
()
==
100
)
{
if
(!
WorkUtils
.
hasPermission
(
PagePermissionType
.
EQUIPMENT_PURCHASE_REPAIR_UPDATE
.
getPermission
()))
{
if
(!
WorkUtils
.
hasPermission
(
PagePermissionType
.
EQUIPMENT_PURCHASE_REPAIR_UPDATE
.
getPermission
()))
{
llBottom
.
setVisibility
(
View
.
GONE
);
llBottom
.
setVisibility
(
View
.
GONE
);
...
@@ -110,18 +120,16 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
...
@@ -110,18 +120,16 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
if
(!
WorkUtils
.
hasPermission
(
PagePermissionType
.
EQUIPMENT_PURCHASE_REPAIR_APPLY
.
getPermission
()))
{
if
(!
WorkUtils
.
hasPermission
(
PagePermissionType
.
EQUIPMENT_PURCHASE_REPAIR_APPLY
.
getPermission
()))
{
llBottom
.
setVisibility
(
View
.
GONE
);
llBottom
.
setVisibility
(
View
.
GONE
);
}
else
{
}
else
{
if
(
TextUtils
.
equals
(
UserKeeper
.
getInstance
().
getUserDepId
(),
info
.
getReceiveDeptId
()
+
""
)
&&
TextUtils
.
equals
(
UserKeeper
.
getInstance
().
getUserDepRuler
(),
"1"
))
{
llBottom
.
setVisibility
(
View
.
VISIBLE
);
llBottom
.
setVisibility
(
View
.
VISIBLE
);
tvRefuse
.
setText
(
"拒单"
);
tvRefuse
.
setText
(
"拒单"
);
tvAgree
.
setText
(
"接单"
);
tvAgree
.
setText
(
"接单"
);
}
}
}
}
else
{
}
else
{
llBottom
.
setVisibility
(
View
.
GONE
);
llBottom
.
setVisibility
(
View
.
GONE
);
}
}
dataList
=
new
ArrayList
<>();
dataAdapter
=
new
DeviceDetailAdapter
(
R
.
layout
.
item_device_detail
,
dataList
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
param
=
new
HashMap
<>();
param
.
put
(
"id"
,
info
.
getId
());
}
}
private
void
getData
(
String
id
)
{
private
void
getData
(
String
id
)
{
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceRepairDetailActivity.java
浏览文件 @
899f2bd0
...
@@ -97,6 +97,15 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
...
@@ -97,6 +97,15 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
tvOrderTime
.
setText
(
info
.
getCreatedTime
());
tvOrderTime
.
setText
(
info
.
getCreatedTime
());
tvPrice
.
setText
(
info
.
getCreatedTime
());
tvPrice
.
setText
(
info
.
getCreatedTime
());
tvRemark
.
setText
(
info
.
getRemark
());
tvRemark
.
setText
(
info
.
getRemark
());
changePermissionView
();
dataList
=
new
ArrayList
<>();
dataAdapter
=
new
DeviceDetailAdapter
(
R
.
layout
.
item_device_detail
,
dataList
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
param
=
new
HashMap
<>();
param
.
put
(
"id"
,
info
.
getId
());
}
private
void
changePermissionView
()
{
if
(
info
.
getStatus
()
==
100
)
{
if
(
info
.
getStatus
()
==
100
)
{
if
(!
WorkUtils
.
hasPermission
(
PagePermissionType
.
EQUIPMENT_REPAIR_UPDATE
.
getPermission
()))
{
if
(!
WorkUtils
.
hasPermission
(
PagePermissionType
.
EQUIPMENT_REPAIR_UPDATE
.
getPermission
()))
{
llBottom
.
setVisibility
(
View
.
GONE
);
llBottom
.
setVisibility
(
View
.
GONE
);
...
@@ -114,11 +123,6 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
...
@@ -114,11 +123,6 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
}
else
{
}
else
{
llBottom
.
setVisibility
(
View
.
GONE
);
llBottom
.
setVisibility
(
View
.
GONE
);
}
}
dataList
=
new
ArrayList
<>();
dataAdapter
=
new
DeviceDetailAdapter
(
R
.
layout
.
item_device_detail
,
dataList
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
param
=
new
HashMap
<>();
param
.
put
(
"id"
,
info
.
getId
());
}
}
private
void
getData
(
String
id
)
{
private
void
getData
(
String
id
)
{
...
...
app/src/main/java/com/wd/workoffice/util/UserKeeper.java
浏览文件 @
899f2bd0
...
@@ -23,7 +23,6 @@ public class UserKeeper {
...
@@ -23,7 +23,6 @@ public class UserKeeper {
private
final
String
USER_INFO
=
"_USER_INFO"
;
private
final
String
USER_INFO
=
"_USER_INFO"
;
private
final
String
MES_LOGIN
=
"_MES_LOGIN"
;
private
final
String
MES_LOGIN
=
"_MES_LOGIN"
;
private
final
String
MES_LOGIN_INFO
=
"_MES_LOGIN_INFO"
;
private
final
String
MES_LOGIN_INFO
=
"_MES_LOGIN_INFO"
;
private
final
String
MES_UID
=
"_MES_UID"
;
private
final
String
COOKIE
=
"_COOKIE"
;
private
final
String
COOKIE
=
"_COOKIE"
;
private
final
String
IS_AGREE
=
"_IS_AGREE"
;
private
final
String
IS_AGREE
=
"_IS_AGREE"
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论