2024-04-25 修改

修改:

1. 日付费用申请，数量设置为可以填写小数，单项费用（数量 * 单价）保留两位小数

2. 日付费用申请，界面UI细微调整

app/src/main/java/com/pan_american/android/data/model/daily_payment/entity/DailyPaymentListItem.kt

@@ -1,5 +1,5 @@
 package com.pan_american.android.data.model.daily_payment.entity
 
-class DailyPaymentListItem(var priceName: String, var quantity: Int, var price: Float, val itemTotal: Double, var remark: String) {
+class DailyPaymentListItem(var priceName: String, var quantity: Double, var price: Double, val itemTotal: Double, var remark: String) {
     var id = 0
 }

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

@@ -1,7 +1,6 @@
 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
@@ -10,7 +9,6 @@ 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
@@ -442,10 +440,10 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
                             dailyPaymentList.add(
                                 DailyPaymentListItem(
                                     paymentItemName.text.toString(),
-                                    paymentItemCount.text.toString().toInt(),
-                                    paymentItemPrice.text.toString().toFloat(),
+                                    paymentItemCount.text.toString().toDouble(),
+                                    paymentItemPrice.text.toString().toDouble(),
                                     paymentItemCount.text.toString()
-                                        .toInt() * paymentItemPrice.text.toString().toDouble(),
+                                        .toDouble() * paymentItemPrice.text.toString().toDouble(),
                                     paymentItemRemark.getText().trim()
                                 )
                             )
@@ -616,7 +614,12 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
                         )
                         paymentItemPrice.isFocusable = false
 
-                        paymentItemRemark.setText(item.remark)
+                        if (item.remark.isBlank()) {
+                            paymentItemRemark.setText(resources.getString(R.string.none))
+                        } else {
+                            paymentItemRemark.setText(item.remark)
+                        }
+
                         paymentItemRemark.isEnabled(false)
 
                         commit.setOnClickListener {
@@ -645,7 +648,7 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
     }
 
     private fun deletePaymentItem(position: Int) {
-        totalPayment -= dailyPaymentList[position].quantity * dailyPaymentList[position].price
+        totalPayment -= dailyPaymentList[position].itemTotal
 
         dailyPaymentList.removeAt(position)
         binding.paymentItemList.adapter!!.notifyItemRemoved(position)
@@ -666,18 +669,18 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
 
         binding.updateLoading.visibility = View.VISIBLE
 
-        Log.e(
-            "request", Gson().toJson(
-                AddDailyPaymentRequest(
-                    binding.paymentNotes.getText().trim(),
-                    totalPayment,
-                    transferIdentifyId,
-                    feeSubTypeId,
-                    companyId,
-                    dailyPaymentList
-                )
-            )
-        )
+//        Log.e(
+//            "request", Gson().toJson(
+//                AddDailyPaymentRequest(
+//                    binding.paymentNotes.getText().trim(),
+//                    totalPayment,
+//                    transferIdentifyId,
+//                    feeSubTypeId,
+//                    companyId,
+//                    dailyPaymentList
+//                )
+//            )
+//        )
 
         apiService.addDailyPayment(
             AddDailyPaymentRequest(
@@ -812,19 +815,19 @@ 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
-                )
-            )
-        )
+//        Log.e(
+//            "request", Gson().toJson(
+//                UpdateDailyPaymentRequest(
+//                    dailyPaymentId,
+//                    binding.paymentNotes.getText().trim(),
+//                    totalPayment,
+//                    transferIdentifyId,
+//                    feeSubTypeId,
+//                    companyId,
+//                    dailyPaymentList
+//                )
+//            )
+//        )
 
         apiService.updateDailyPaymentDetail(
             UpdateDailyPaymentRequest(

app/src/main/res/layout/popup_add_daily_payment.xml

@@ -77,7 +77,7 @@
                 android:gravity="end"
                 android:hint="@string/please_input"
                 android:importantForAutofill="no"
-                android:inputType="number"
+                android:inputType="numberDecimal"
                 android:singleLine="true"
                 android:textColorHint="@color/hint_text_color"
                 android:textSize="@dimen/text_size_medium" />

app/src/main/res/values/strings.xml

@@ -35,6 +35,7 @@
     <string name="sift">筛选</string>
     <string name="search">搜索</string>
 
+    <string name="none">无</string>
     <string name="no_info">暂无</string>
     <string name="no_data">暂无数据</string>