diff --git a/app/src/main/java/com/shuwei/dish/match/ui/PackActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/PackActivity.kt
index a930685..523f401 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/PackActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/PackActivity.kt
@@ -98,11 +98,10 @@ class PackActivity : BaseActivity() {
}
}
- val titleText = "菜品净菜包"
setTitleBar(titleBarAction = {
it.visible()
}, titleAction = {
- it.text = titleText
+ it.text = "餐品净菜包"
}, rightIconAction = {
it.gone()
}, backAction = {
@@ -274,9 +273,9 @@ class PackActivity : BaseActivity() {
//包装餐品名称
params["mealName"] = food.foodName
//包装日期
- params["packageDate"] = DateTimeUtil.formatDateTime(LocalDateTime.now())
- //操作类型
- params["opType"] = "设备自动"
+ params["packageDate"] = DateTimeUtil.formatDateTime(dateTime = LocalDateTime.now(), pattern = DateTimeUtil.YYYY_MM_DD)
+// //操作类型
+// params["opType"] = "设备自动"
//食材明细列表
params["ingredients"] = list.map {
@@ -557,14 +556,18 @@ class PackActivity : BaseActivity() {
required = false
)
fields.add(deviceField!!)
-// fields.add(
-// FormField(
-// label = "操作类型", type = FieldType.FIXED,
-// apiKey = "opType",
-// required = true,
-// value = "设备自动"
-// )
-// )
+ fields.add(
+ FormField(
+ label = "操作类型", type = FieldType.DROPDOWN,
+ apiKey = "opType",
+ extraApiKeys = mapOf("opType" to "id"),
+ required = true,
+ options = listOf(
+ DictType(id = "1", value = "设备自动"),
+ DictType(id = "2", value = "人工录入")
+ ).toMutableList()
+ )
+ )
loadDictItemsWithCallback("sup_package_method", packageMethodField!!)
loadDeviceOptionsWithCallback(deviceField)
}
@@ -642,7 +645,7 @@ class PackActivity : BaseActivity() {
private fun initRecyclerView() {
initFormList()
binding.rvFormList.let {
- it.layoutManager = GridLayoutManager(this, 2, GridLayoutManager.VERTICAL, false)
+ it.layoutManager = GridLayoutManager(this, 4, GridLayoutManager.VERTICAL, false)
it.adapter = formAdapter
}
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/TaskActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/TaskActivity.kt
index 6b5bf35..0c2de01 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/TaskActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/TaskActivity.kt
@@ -65,6 +65,11 @@ class TaskActivity : BaseActivity() {
initRecyclerView()
initRefreshLayout()
initSearchListener()
+ }
+
+ override fun onResume() {
+ super.onResume()
+ currentPage = 1
loadTaskList()
}
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/TaskDetailActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/TaskDetailActivity.kt
index 596d9e7..58ec38e 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/TaskDetailActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/TaskDetailActivity.kt
@@ -291,7 +291,8 @@ class TaskDetailActivity : BaseActivity() {
toast(msg)
return@addComboTask
}
- toast("上报成功")
+ toast("组配成功")
+ finish()
}
}
}
diff --git a/app/src/main/java/com/shuwei/dish/match/utils/DateTimeUtil.kt b/app/src/main/java/com/shuwei/dish/match/utils/DateTimeUtil.kt
index 12983d7..cb5bce3 100644
--- a/app/src/main/java/com/shuwei/dish/match/utils/DateTimeUtil.kt
+++ b/app/src/main/java/com/shuwei/dish/match/utils/DateTimeUtil.kt
@@ -9,6 +9,7 @@ import java.util.Date
object DateTimeUtil {
const val YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"
+ const val YYYY_MM_DD = "yyyy-MM-dd"
fun formatDateTime(dateTime: LocalDateTime, pattern: String = YYYY_MM_DD_HH_MM_SS): String {
val formatter = DateTimeFormatter.ofPattern(pattern)
diff --git a/app/src/main/res/layout/activity_pack.xml b/app/src/main/res/layout/activity_pack.xml
index 4be5f75..ee409e4 100644
--- a/app/src/main/res/layout/activity_pack.xml
+++ b/app/src/main/res/layout/activity_pack.xml
@@ -54,7 +54,7 @@
@@ -62,7 +62,7 @@
android:id="@+id/rvFormList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginHorizontal="20dp"
+ android:layout_marginHorizontal="10dp"
android:layout_marginVertical="10dp"
android:overScrollMode="never" />
@@ -205,7 +205,8 @@
android:id="@+id/btnSubmit"
android:layout_width="match_parent"
android:layout_height="90dp"
- android:layout_margin="30dp"
+ android:layout_marginVertical="20dp"
+ android:layout_marginHorizontal="30dp"
android:background="@drawable/shape_green_bg"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
diff --git a/app/src/main/res/layout/list_item_form_field.xml b/app/src/main/res/layout/list_item_form_field.xml
index 200e2c8..6b65ff7 100644
--- a/app/src/main/res/layout/list_item_form_field.xml
+++ b/app/src/main/res/layout/list_item_form_field.xml
@@ -12,7 +12,7 @@
android:id="@+id/tvLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginHorizontal="12dp"
+ android:layout_marginHorizontal="6dp"
android:layout_marginBottom="6dp"
android:textColor="#FF141428"
android:textSize="20sp"
@@ -146,7 +146,7 @@
android:id="@+id/flInputArea"
android:layout_width="match_parent"
android:layout_height="60dp"
- android:layout_marginHorizontal="12dp"
+ android:layout_marginHorizontal="6dp"
android:visibility="gone">
@@ -160,7 +160,7 @@
android:paddingHorizontal="20dp"
android:textColor="#FF141428"
android:textColorHint="#FF96A0AA"
- android:textSize="22sp"
+ android:textSize="20sp"
android:textStyle="bold"
android:visibility="gone"
tools:ignore="Autofill,TextFields" />
@@ -184,7 +184,7 @@
android:maxLines="1"
android:textColor="#FF141428"
android:textColorHint="#FF96A0AA"
- android:textSize="22sp"
+ android:textSize="20sp"
android:textStyle="bold" />