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
0fd24013
提交
0fd24013
authored
6月 08, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.修改显示字段
2.//TODO 坩埚下单,mes其他页面,mes用户反馈空也展示,编辑任务担当无法修改
上级
2a431300
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
141 行增加
和
29 行删除
+141
-29
DeviceBean.java
app/src/main/java/com/wd/workoffice/bean/DeviceBean.java
+0
-0
DeviceBuyDetailActivity.java
...koffice/ui/activity/bat/work/DeviceBuyDetailActivity.java
+4
-8
DeviceDetailActivity.java
...workoffice/ui/activity/bat/work/DeviceDetailActivity.java
+0
-11
DeviceRepairDetailActivity.java
...fice/ui/activity/bat/work/DeviceRepairDetailActivity.java
+17
-8
DeviceDetailAdapter.java
...ava/com/wd/workoffice/ui/adapter/DeviceDetailAdapter.java
+2
-2
DeviceRepairDetailAdapter.java
...m/wd/workoffice/ui/adapter/DeviceRepairDetailAdapter.java
+30
-0
activity_device_buy_detail.xml
app/src/main/res/layout/activity_device_buy_detail.xml
+3
-0
item_device_repair_detail.xml
app/src/main/res/layout/item_device_repair_detail.xml
+85
-0
没有找到文件。
app/src/main/java/com/wd/workoffice/bean/DeviceBean.java
浏览文件 @
0fd24013
No preview for this file type
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyDetailActivity.java
浏览文件 @
0fd24013
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.View
;
import
android.widget.EditText
;
...
...
@@ -18,13 +16,12 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import
com.wd.workoffice.bean.DeviceBean
;
import
com.wd.workoffice.bean.DeviceBuyBean
;
import
com.wd.workoffice.bean.event.CheckDeviceEvent
;
import
com.wd.workoffice.bean.event.ModifyCarEvent
;
import
com.wd.workoffice.bean.workEnum.PagePermissionType
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.activity.bat.store.StoreSaleCarActivity
;
import
com.wd.workoffice.ui.adapter.DeviceDetailAdapter
;
import
com.wd.workoffice.util.DialogUtils
;
import
com.wd.workoffice.util.MathUtils
;
import
com.wd.workoffice.util.WorkUtils
;
import
org.greenrobot.eventbus.EventBus
;
...
...
@@ -103,7 +100,7 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
tvOrderPeople
.
setText
(
info
.
getLaunchUserName
());
tvOrderDep
.
setText
(
info
.
getLaunchDeptName
());
tvOrderTime
.
setText
(
info
.
getCreatedTime
());
tvPrice
.
setText
(
info
.
getCreatedTime
(
));
tvPrice
.
setText
(
MathUtils
.
converData
(
info
.
getLaunchOrderAmount
(),
3
));
tvRemark
.
setText
(
info
.
getRemark
());
changePermissionView
();
dataList
=
new
ArrayList
<>();
...
...
@@ -150,7 +147,6 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
private
void
getData
(
String
id
)
{
RtfUtils
.
getRtf
().
equipmentPurchaseItemList
(
id
).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseBean
>()
{
@Override
public
void
doOnSubscribe
(
Disposable
d
)
{
}
...
...
@@ -185,7 +181,7 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
}
@OnClick
({
R
.
id
.
tv_finish
,
R
.
id
.
tv_refuse
,
R
.
id
.
tv_agree
})
@OnClick
({
R
.
id
.
tv_finish
,
R
.
id
.
tv_refuse
,
R
.
id
.
tv_agree
})
public
void
onViewClicked
(
View
view
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
tv_refuse
:
...
...
@@ -254,7 +250,7 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
TextView
tvNum
=
view
.
findViewById
(
R
.
id
.
tv_num
);
TextView
tvCancel
=
view
.
findViewById
(
R
.
id
.
tv_cancel
);
EditText
etRemark
=
view
.
findViewById
(
R
.
id
.
et_content
);
WorkUtils
.
addNumListener
(
etRemark
,
tvNum
);
WorkUtils
.
addNumListener
(
etRemark
,
tvNum
);
builder
.
setView
(
view
);
AlertDialog
addCartDialog
=
builder
.
create
();
tvOk
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceDetailActivity.java
浏览文件 @
0fd24013
package
com
.
wd
.
workoffice
.
ui
.
activity
.
bat
.
work
;
import
android.os.Bundle
;
import
android.widget.TextView
;
import
com.alibaba.fastjson.JSON
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseBean
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.DeviceBean
;
import
com.wd.workoffice.bean.SendApplyDetailBean
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.SendApplyDetailAdapter
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
flexible.xd.android_base.network.rtfhttp.Transformer
;
import
io.reactivex.disposables.Disposable
;
/**
* 設備详情
...
...
@@ -56,9 +48,6 @@ public class DeviceDetailActivity extends WorkToolBarActivity {
TextView
tvCheckMonth
;
@BindView
(
R
.
id
.
tv_code
)
TextView
tvCode
;
private
List
<
SendApplyDetailBean
>
dataList
;
private
SendApplyDetailAdapter
dataAdapter
;
private
Map
<
String
,
Object
>
param
;
private
DeviceBean
.
RecordsBean
info
;
@Override
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceRepairDetailActivity.java
浏览文件 @
0fd24013
package
com
.
wd
.
workoffice
.
ui
.
activity
.
bat
.
work
;
import
android.os.Bundle
;
import
android.text.Editable
;
import
android.text.TextUtils
;
import
android.text.TextWatcher
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.widget.EditText
;
import
android.widget.LinearLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
com.alibaba.fastjson.JSON
;
...
...
@@ -22,7 +21,7 @@ import com.wd.workoffice.bean.event.CheckDeviceEvent;
import
com.wd.workoffice.bean.workEnum.PagePermissionType
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.DeviceDetailAdapter
;
import
com.wd.workoffice.ui.adapter.Device
Repair
DetailAdapter
;
import
com.wd.workoffice.util.DialogUtils
;
import
com.wd.workoffice.util.MathUtils
;
import
com.wd.workoffice.util.WorkUtils
;
...
...
@@ -81,8 +80,14 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
TextView
tvFinish
;
@BindView
(
R
.
id
.
ll_check
)
LinearLayout
llCheck
;
@BindView
(
R
.
id
.
ll_code
)
RelativeLayout
llCode
;
@BindView
(
R
.
id
.
ll_status
)
RelativeLayout
llStatus
;
@BindView
(
R
.
id
.
tv_price_desc
)
TextView
tvPriceDesc
;
private
List
<
DeviceBean
.
RecordsBean
>
dataList
;
private
DeviceDetailAdapter
dataAdapter
;
private
Device
Repair
DetailAdapter
dataAdapter
;
private
Map
<
String
,
Object
>
param
;
private
DeviceBuyBean
.
RecordsBean
info
;
...
...
@@ -91,6 +96,9 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
ButterKnife
.
bind
(
this
);
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
tvDesc
.
setText
(
"维修明细"
);
llCode
.
setVisibility
(
View
.
GONE
);
llStatus
.
setVisibility
(
View
.
GONE
);
tvPriceDesc
.
setText
(
"维修时间"
);
}
@Override
...
...
@@ -103,11 +111,11 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
tvOrderPeople
.
setText
(
info
.
getLaunchUserName
());
tvOrderDep
.
setText
(
info
.
getLaunchDeptName
());
tvOrderTime
.
setText
(
info
.
getCreatedTime
());
tvPrice
.
setText
(
MathUtils
.
converData
(
info
.
getLaunchOrderAmount
(),
3
)
);
tvPrice
.
setText
(
info
.
getCreatedTime
().
split
(
" "
)[
0
]
);
tvRemark
.
setText
(
info
.
getRemark
());
changePermissionView
();
dataList
=
new
ArrayList
<>();
dataAdapter
=
new
Device
DetailAdapter
(
R
.
layout
.
item_device
_detail
,
dataList
);
dataAdapter
=
new
Device
RepairDetailAdapter
(
R
.
layout
.
item_device_repair
_detail
,
dataList
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
param
=
new
HashMap
<>();
param
.
put
(
"id"
,
info
.
getId
());
...
...
@@ -186,7 +194,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
}
@OnClick
({
R
.
id
.
tv_finish
,
R
.
id
.
tv_refuse
,
R
.
id
.
tv_agree
})
@OnClick
({
R
.
id
.
tv_finish
,
R
.
id
.
tv_refuse
,
R
.
id
.
tv_agree
})
public
void
onViewClicked
(
View
view
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
tv_refuse
:
...
...
@@ -219,6 +227,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
break
;
}
}
private
void
finishDevice
()
{
RtfUtils
.
getRtf
().
equipmentRepairFinish
(
info
.
getId
()).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseBean
>()
{
@Override
...
...
@@ -254,7 +263,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
TextView
tvNum
=
view
.
findViewById
(
R
.
id
.
tv_num
);
TextView
tvCancel
=
view
.
findViewById
(
R
.
id
.
tv_cancel
);
EditText
etRemark
=
view
.
findViewById
(
R
.
id
.
et_content
);
WorkUtils
.
addNumListener
(
etRemark
,
tvNum
);
WorkUtils
.
addNumListener
(
etRemark
,
tvNum
);
builder
.
setView
(
view
);
AlertDialog
addCartDialog
=
builder
.
create
();
tvOk
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/DeviceDetailAdapter.java
浏览文件 @
0fd24013
...
...
@@ -23,8 +23,8 @@ public class DeviceDetailAdapter extends BaseQuickAdapter<DeviceBean.RecordsBean
@Override
protected
void
convert
(
BaseViewHolder
helper
,
DeviceBean
.
RecordsBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getEquipmentName
());
helper
.
setText
(
R
.
id
.
tv_price
,
item
.
getUnitPrice
(
));
helper
.
setText
(
R
.
id
.
tv_num
,
item
.
getQuantity
()
);
helper
.
setText
(
R
.
id
.
tv_price
,
MathUtils
.
converData
(
item
.
getUnitPrice
(),
3
));
helper
.
setText
(
R
.
id
.
tv_num
,
MathUtils
.
converData
(
item
.
getQuantity
(),
3
)
);
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/DeviceRepairDetailAdapter.java
0 → 100644
浏览文件 @
0fd24013
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.DeviceBean
;
import
com.wd.workoffice.util.MathUtils
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
DeviceRepairDetailAdapter
extends
BaseQuickAdapter
<
DeviceBean
.
RecordsBean
,
BaseViewHolder
>
{
public
DeviceRepairDetailAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
DeviceBean
.
RecordsBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getEquipmentName
());
helper
.
setText
(
R
.
id
.
tv_component
,
item
.
getSubEquipmentName
());
helper
.
setText
(
R
.
id
.
tv_spare_parts
,
item
.
getReplaceSparePartName
()
);
}
}
app/src/main/res/layout/activity_device_buy_detail.xml
浏览文件 @
0fd24013
...
...
@@ -92,6 +92,7 @@
</LinearLayout>
<RelativeLayout
android:id=
"@+id/ll_code"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
...
...
@@ -118,6 +119,7 @@
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:id=
"@+id/ll_status"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
...
...
@@ -258,6 +260,7 @@
android:paddingVertical=
"15mm"
>
<TextView
android:id=
"@+id/tv_price_desc"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"金额(元)"
...
...
app/src/main/res/layout/item_device_repair_detail.xml
0 → 100644
浏览文件 @
0fd24013
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"10mm"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"#FCFCFD"
android:orientation=
"vertical"
android:padding=
"10mm"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
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_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
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_component"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
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_spare_parts"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论