Selaa lähdekoodia

2024-05-30 新增

新增

1. 添加 文档下载 搜团组索
zhaiy 10 kuukautta sitten
vanhempi
commit
d2f39542c8

+ 1 - 1
app/src/main/java/com/pan_american/android/data/model/document/network/DocumentGroupListRequest.kt

@@ -4,6 +4,6 @@ import com.pan_american.android.OASystem
 import com.pan_american.android.base.BaseRequest
 
 class DocumentGroupListRequest: BaseRequest() {
-    val groupName = ""
+    var groupName = ""
     val userId = OASystem.userInfo.userId
 }

+ 9 - 6
app/src/main/java/com/pan_american/android/ui/document/DocumentFragment.kt

@@ -37,8 +37,10 @@ class DocumentFragment : BaseFragment<FragmentDocumentBinding>(), OnClickListene
 
                         binding.voucher.setOnClickListener(this)
                         binding.confirmList.setOnClickListener(this)
-                        if (OASystem.userInfo.depName != "市场部") {
-                            binding.predetermineCost.setOnClickListener(this)
+                        binding.predetermineCost.setOnClickListener(this)
+
+                        if (OASystem.userInfo.depName == "市场部") {
+                            binding.predetermineCost.visibility = View.GONE
                         }
                     }
                 }
@@ -49,12 +51,13 @@ class DocumentFragment : BaseFragment<FragmentDocumentBinding>(), OnClickListene
                             binding.groupAirplaneTicket.visibility = View.VISIBLE
                         }
 
-                        if (OASystem.userInfo.depName != "市场部") {
-                            binding.airplaneReportForm.setOnClickListener(this)
-                        }
-
+                        binding.airplaneReportForm.setOnClickListener(this)
                         binding.chTravelItinerary.setOnClickListener(this)
                         binding.enTravelItinerary.setOnClickListener(this)
+
+                        if (OASystem.userInfo.depName == "市场部") {
+                            binding.airplaneReportForm.visibility = View.GONE
+                        }
                     }
                 }
 

+ 14 - 0
app/src/main/java/com/pan_american/android/ui/document/DocumentGroupListActivity.kt

@@ -83,7 +83,21 @@ class DocumentGroupListActivity : BaseActivity<ActivityDocumentGroupListBinding>
                 }
 
                 override fun afterTextChanged(p0: Editable?) {
+                    groupNameListRequest.pageIndex = 1
 
+                    if (searchText.text.isNullOrBlank()) {
+                        groupNameListRequest.groupName = ""
+                    } else {
+                        groupNameListRequest.groupName = p0.toString()
+                    }
+
+                    pageIndex = 1
+                    binding.groupList.adapter!!.notifyItemRangeRemoved(
+                        0, groupNameList.size
+                    )
+                    groupNameList.clear()
+                    listInit = false
+                    getGroupList(1)
                 }
             })