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
9e9f9524
提交
9e9f9524
authored
7月 04, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.修改订单详情-子功能详情审核-显示影隐藏
上级
8a3d67cc
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
29 行增加
和
12 行删除
+29
-12
EndApplyActivity.java
...wd/workoffice/ui/activity/bat/order/EndApplyActivity.java
+16
-6
EndApplyDetailActivity.java
...koffice/ui/activity/bat/order/EndApplyDetailActivity.java
+2
-1
SendApplyDetailActivity.java
...office/ui/activity/bat/order/SendApplyDetailActivity.java
+1
-2
UseApplyDetailActivity.java
...koffice/ui/activity/bat/order/UseApplyDetailActivity.java
+1
-2
EndApplyAdapter.java
...in/java/com/wd/workoffice/ui/adapter/EndApplyAdapter.java
+9
-1
没有找到文件。
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/EndApplyActivity.java
浏览文件 @
9e9f9524
package
com
.
wd
.
workoffice
.
ui
.
activity
.
bat
.
order
;
package
com
.
wd
.
workoffice
.
ui
.
activity
.
bat
.
order
;
import
android.text.Editable
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.text.TextWatcher
;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
...
@@ -19,7 +17,6 @@ import com.wd.workoffice.R;
...
@@ -19,7 +17,6 @@ import com.wd.workoffice.R;
import
com.wd.workoffice.app.BaseBean
;
import
com.wd.workoffice.app.BaseBean
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.EndApplyBean
;
import
com.wd.workoffice.bean.EndApplyBean
;
import
com.wd.workoffice.bean.event.AddLogEvent
;
import
com.wd.workoffice.bean.event.CheckOrderEvent
;
import
com.wd.workoffice.bean.event.CheckOrderEvent
;
import
com.wd.workoffice.bean.event.CheckSendEvent
;
import
com.wd.workoffice.bean.event.CheckSendEvent
;
import
com.wd.workoffice.bean.workEnum.OrderType
;
import
com.wd.workoffice.bean.workEnum.OrderType
;
...
@@ -76,6 +73,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
...
@@ -76,6 +73,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
dataAdapter
=
new
EndApplyAdapter
(
R
.
layout
.
item_send_apply
,
dataList
);
dataAdapter
=
new
EndApplyAdapter
(
R
.
layout
.
item_send_apply
,
dataList
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
dataAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvData
);
dataAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvData
);
changePermission
();
param
=
WorkUtils
.
pageKey
();
param
=
WorkUtils
.
pageKey
();
page
=
1
;
page
=
1
;
param
.
put
(
"current"
,
page
);
param
.
put
(
"current"
,
page
);
...
@@ -119,6 +117,17 @@ public class EndApplyActivity extends WorkToolBarActivity {
...
@@ -119,6 +117,17 @@ public class EndApplyActivity extends WorkToolBarActivity {
});
});
}
}
private
void
changePermission
()
{
String
orderType
=
getIntent
().
getStringExtra
(
"orderType"
);
boolean
hasPermission
=
true
;
if
(
TextUtils
.
equals
(
orderType
,
OrderType
.
SALE
.
getCode
()))
{
hasPermission
=
WorkUtils
.
hasPermission
(
PagePermissionType
.
SO_ADVANCE_AUDIT
.
getPermission
());
}
else
if
(
TextUtils
.
equals
(
orderType
,
OrderType
.
OUT_BUY
.
getCode
()))
{
hasPermission
=
WorkUtils
.
hasPermission
(
PagePermissionType
.
PO_ADVANCE_AUDIT
.
getPermission
());
}
dataAdapter
.
setHasPermission
(
hasPermission
);
dataAdapter
.
notifyDataSetChanged
();
}
@Override
@Override
protected
void
initEvent
()
{
protected
void
initEvent
()
{
...
@@ -135,6 +144,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
...
@@ -135,6 +144,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
EndApplyDetailActivity
.
class
,
startActivity
(
EndApplyDetailActivity
.
class
,
"orderType"
,
getIntent
().
getStringExtra
(
"orderType"
),
"orderType"
,
getIntent
().
getStringExtra
(
"orderType"
),
"hasPermission"
,
dataAdapter
.
isHasPermission
()?
"1"
:
"0"
,
"info"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
"info"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
}
}
});
});
...
@@ -277,7 +287,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
...
@@ -277,7 +287,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
getData
();
getData
();
}
}
private
void
checkDialog
(
int
status
,
int
id
)
{
private
void
checkDialog
(
int
status
,
int
id
)
{
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
this
);
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
this
);
View
view
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
view_check
,
null
);
View
view
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
view_check
,
null
);
TextView
tvOk
=
view
.
findViewById
(
R
.
id
.
tv_ok
);
TextView
tvOk
=
view
.
findViewById
(
R
.
id
.
tv_ok
);
...
@@ -296,7 +306,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
...
@@ -296,7 +306,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
toast
(
"请填写备注"
);
toast
(
"请填写备注"
);
return
;
return
;
}
}
check
(
status
,
etRemark
.
getText
().
toString
(),
id
);
check
(
status
,
etRemark
.
getText
().
toString
(),
id
);
addCartDialog
.
dismiss
();
addCartDialog
.
dismiss
();
}
}
});
});
...
@@ -310,7 +320,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
...
@@ -310,7 +320,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
}
}
private
void
check
(
int
status
,
String
remark
,
int
id
)
{
private
void
check
(
int
status
,
String
remark
,
int
id
)
{
param
.
put
(
"status"
,
status
);
param
.
put
(
"status"
,
status
);
param
.
put
(
"auditRemark"
,
remark
);
param
.
put
(
"auditRemark"
,
remark
);
param
.
put
(
"id"
,
id
);
param
.
put
(
"id"
,
id
);
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/EndApplyDetailActivity.java
浏览文件 @
9e9f9524
...
@@ -67,7 +67,8 @@ public class EndApplyDetailActivity extends WorkToolBarActivity {
...
@@ -67,7 +67,8 @@ public class EndApplyDetailActivity extends WorkToolBarActivity {
tvTime
.
setText
(
info
.
getCreatedTime
());
tvTime
.
setText
(
info
.
getCreatedTime
());
tvPerson
.
setText
(
info
.
getApplyUserName
());
tvPerson
.
setText
(
info
.
getApplyUserName
());
tvRemark
.
setText
(
info
.
getApplyRemark
());
tvRemark
.
setText
(
info
.
getApplyRemark
());
if
(
TextUtils
.
equals
(
info
.
getStatus
(),
"0"
)
&&
TextUtils
.
equals
(
UserKeeper
.
getInstance
().
getUserDepId
(),
String
.
valueOf
(
info
.
getCanAuditDeptId
())))
{
if
(
TextUtils
.
equals
(
info
.
getStatus
(),
"0"
)
&&
TextUtils
.
equals
(
getIntent
().
getStringExtra
(
"hasPermission"
),
"1"
)
&&
TextUtils
.
equals
(
UserKeeper
.
getInstance
().
getUserDepId
(),
String
.
valueOf
(
info
.
getCanAuditDeptId
())))
{
llBottom
.
setVisibility
(
View
.
VISIBLE
);
llBottom
.
setVisibility
(
View
.
VISIBLE
);
}
else
{
}
else
{
llBottom
.
setVisibility
(
View
.
GONE
);
llBottom
.
setVisibility
(
View
.
GONE
);
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SendApplyDetailActivity.java
浏览文件 @
9e9f9524
...
@@ -97,8 +97,7 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
...
@@ -97,8 +97,7 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
hasPermission
=
WorkUtils
.
hasPermission
(
PagePermissionType
.
CO_OUT_AUDIT
.
getPermission
());
hasPermission
=
WorkUtils
.
hasPermission
(
PagePermissionType
.
CO_OUT_AUDIT
.
getPermission
());
}
}
if
(!
hasPermission
)
{
if
(!
hasPermission
)
{
tvRefuse
.
setVisibility
(
View
.
GONE
);
llBottom
.
setVisibility
(
View
.
GONE
);
tvAgree
.
setVisibility
(
View
.
GONE
);
}
}
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/UseApplyDetailActivity.java
浏览文件 @
9e9f9524
...
@@ -103,8 +103,7 @@ public class UseApplyDetailActivity extends WorkToolBarActivity {
...
@@ -103,8 +103,7 @@ public class UseApplyDetailActivity extends WorkToolBarActivity {
hasPermission
=
WorkUtils
.
hasPermission
(
PagePermissionType
.
AO_USE_APPLY_AUDIT
.
getPermission
());
hasPermission
=
WorkUtils
.
hasPermission
(
PagePermissionType
.
AO_USE_APPLY_AUDIT
.
getPermission
());
}
}
if
(!
hasPermission
)
{
if
(!
hasPermission
)
{
tvAgree
.
setVisibility
(
View
.
GONE
);
llBottom
.
setVisibility
(
View
.
GONE
);
tvRefuse
.
setVisibility
(
View
.
GONE
);
}
}
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/EndApplyAdapter.java
浏览文件 @
9e9f9524
...
@@ -20,6 +20,7 @@ import androidx.annotation.Nullable;
...
@@ -20,6 +20,7 @@ import androidx.annotation.Nullable;
*/
*/
public
class
EndApplyAdapter
extends
BaseQuickAdapter
<
EndApplyBean
.
RecordsBean
,
BaseViewHolder
>
{
public
class
EndApplyAdapter
extends
BaseQuickAdapter
<
EndApplyBean
.
RecordsBean
,
BaseViewHolder
>
{
boolean
hasPermission
=
true
;
public
EndApplyAdapter
(
int
layoutResId
,
List
data
)
{
public
EndApplyAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
super
(
layoutResId
,
data
);
...
@@ -32,13 +33,20 @@ public class EndApplyAdapter extends BaseQuickAdapter<EndApplyBean.RecordsBean,
...
@@ -32,13 +33,20 @@ public class EndApplyAdapter extends BaseQuickAdapter<EndApplyBean.RecordsBean,
helper
.
setText
(
R
.
id
.
tv_reason
,
item
.
getApplyRemark
());
helper
.
setText
(
R
.
id
.
tv_reason
,
item
.
getApplyRemark
());
helper
.
setText
(
R
.
id
.
tv_time
,
item
.
getCreatedTime
());
helper
.
setText
(
R
.
id
.
tv_time
,
item
.
getCreatedTime
());
helper
.
setText
(
R
.
id
.
tv_status
,
WorkUtils
.
getFinancialStatus
(
Integer
.
valueOf
(
item
.
getStatus
())));
helper
.
setText
(
R
.
id
.
tv_status
,
WorkUtils
.
getFinancialStatus
(
Integer
.
valueOf
(
item
.
getStatus
())));
if
(
TextUtils
.
equals
(
item
.
getStatus
(),
"0"
)
&&
TextUtils
.
equals
(
UserKeeper
.
getInstance
().
getUserDepId
(),
String
.
valueOf
(
item
.
getCanAuditDeptId
())))
{
if
(
TextUtils
.
equals
(
item
.
getStatus
(),
"0"
)
&&
hasPermission
&&
TextUtils
.
equals
(
UserKeeper
.
getInstance
().
getUserDepId
(),
String
.
valueOf
(
item
.
getCanAuditDeptId
())))
{
helper
.
setVisible
(
R
.
id
.
ll_btn
,
true
);
helper
.
setVisible
(
R
.
id
.
ll_btn
,
true
);
helper
.
addOnClickListener
(
R
.
id
.
tv_agree
);
helper
.
addOnClickListener
(
R
.
id
.
tv_agree
);
helper
.
addOnClickListener
(
R
.
id
.
tv_refuse
);
helper
.
addOnClickListener
(
R
.
id
.
tv_refuse
);
}
}
}
public
boolean
isHasPermission
()
{
return
hasPermission
;
}
public
void
setHasPermission
(
boolean
hasPermission
)
{
this
.
hasPermission
=
hasPermission
;
}
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论