2024-04-22 修改

修改:

1. 日付费用申请，部分逻辑优化
2. 接团信息，部分逻辑优化

app/src/main/java/com/pan_american/android/ui/efficiency_tools/daily_payment/AddDailyPaymentActivity.kt

@@ -1,6 +1,7 @@
 package com.pan_american.android.ui.efficiency_tools.daily_payment
 
 import android.os.Bundle
+import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -9,6 +10,7 @@ import android.widget.PopupWindow
 import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.gson.Gson
 import com.pan_american.android.OASystem
 import com.pan_american.android.R
 import com.pan_american.android.base.BaseActivity
@@ -103,9 +105,9 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
             dailyPaymentId = intent.getIntExtra("daily_payment_id", 0)
         }
 
-        if (intent.getIntExtra("finance_status", 0) != 0 || intent.getIntExtra(
-                "manager_status", 0
-            ) != 0 || !OASystem.authorization(OASystem.DAILY_PAYMENT, OASystem.EDIT)
+        if (intent.getIntExtra("finance_status", 0) != 0
+            || intent.getIntExtra("manager_status", 0) != 0
+            || !OASystem.authorization(OASystem.DAILY_PAYMENT, OASystem.EDIT)
         ) {
             canBeEdit = false
         }
@@ -464,9 +466,11 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
 
         binding.commit.setOnClickListener {
 
-            if (!canBeEdit) {
-                back()
-                return@setOnClickListener
+            if (fromList) {
+                if (!canBeEdit) {
+                    back()
+                    return@setOnClickListener
+                }
             }
 
             when {
@@ -582,7 +586,11 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
         val adapter = CardAdapter.Builder<DailyPaymentListItem>().apply {
             setLayoutId(R.layout.item_delete_button_selector)
             setData(dailyPaymentList)
-            setCanDelete(OASystem.authorization(OASystem.DAILY_PAYMENT, OASystem.EDIT))
+            if (fromList) {
+                setCanDelete(OASystem.authorization(OASystem.DAILY_PAYMENT, OASystem.EDIT))
+            } else {
+                setCanDelete(OASystem.authorization(OASystem.DAILY_PAYMENT, OASystem.ADD))
+            }
             addBindView { itemView, data ->
                 itemView.findViewById<TextView>(R.id.left_text).text = data.priceName
                 itemView.findViewById<TextView>(R.id.right_text).text =
@@ -662,6 +670,19 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
 
         binding.updateLoading.visibility = View.VISIBLE
 
+        Log.e(
+            "request", Gson().toJson(
+                AddDailyPaymentRequest(
+                    binding.paymentNotes.getText().trim(),
+                    totalPayment,
+                    transferIdentifyId,
+                    feeSubTypeId,
+                    companyId,
+                    dailyPaymentList
+                )
+            )
+        )
+
         apiService.addDailyPayment(
             AddDailyPaymentRequest(
                 binding.paymentNotes.getText().trim(),
@@ -795,6 +816,20 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
 
         binding.updateLoading.visibility = View.VISIBLE
 
+        Log.e(
+            "request", Gson().toJson(
+                UpdateDailyPaymentRequest(
+                    dailyPaymentId,
+                    binding.paymentNotes.getText().trim(),
+                    totalPayment,
+                    transferIdentifyId,
+                    feeSubTypeId,
+                    companyId,
+                    dailyPaymentList
+                )
+            )
+        )
+
         apiService.updateDailyPaymentDetail(
             UpdateDailyPaymentRequest(
                 dailyPaymentId,

app/src/main/java/com/pan_american/android/ui/group_management/group_info/GroupInfoBaseFragment.kt

@@ -70,6 +70,8 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
             for (item in OASystem.opPercentageLevel) {
                 if (OASystem.groupOperationRequest.opRoyaltyLv == item.id) {
                     opPercentageLevel.text = item.name
+
+                    opPercentageSelected = true
                 }
             }
 
@@ -112,8 +114,6 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
                     opPercentageSubLevel = item.remark.split("&")
                 }
             }
-
-            opPercentageSelected = true
         }
 
         binding.prePayment.filters = arrayOf(MoneyInputFilter())