2024-04-30 修改

修改

1. 同步更新OP费用详情 尾款时 尾款金额和其它额外费用日期不显示

2. 日付申请list UI 更新

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/adapter/GroundConveyTableAdapter.kt

@@ -160,7 +160,13 @@ class GroundConveyTableAdapter(private val itemList: ArrayList<GroundConveyTable
 
         holder.listItem.visibility = View.VISIBLE
 
-        holder.date.text = item.datePrice.substring(0, 10)
+        //2024-04-30 OP费用录入若item是尾款或其它额外费用则不显示时间
+        if (item.sId == 1070 || item.sId == 1071) {
+            holder.date.text = "无"
+        } else {
+            holder.date.text = item.datePrice.substring(0, 10)
+        }
+
         holder.detail.setText(item.priceContent)
 
         holder.price.filters = arrayOf(MoneyInputFilter())

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

@@ -36,7 +36,8 @@
                 android:layout_width="@dimen/common_padding_heavy"
                 android:layout_height="@dimen/common_padding_heavy"
                 android:layout_marginEnd="@dimen/common_padding"
-                android:src="@mipmap/icon_delete" />
+                android:src="@mipmap/icon_delete"
+                tools:ignore="ContentDescription" />
 
         </LinearLayout>
 
@@ -54,17 +55,17 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_weight="1"
                 android:text="@string/payment_revert"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
                 android:id="@+id/payment_revert"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
                 android:singleLine="true"
@@ -86,17 +87,17 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_weight="1"
                 android:text="@string/payment_creator"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
                 android:id="@+id/payment_creator"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
                 android:singleLine="true"
@@ -118,17 +119,17 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_weight="1"
                 android:text="@string/total_payment"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
                 android:id="@+id/total_payment"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
                 android:singleLine="true"
@@ -150,17 +151,17 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_weight="1"
                 android:text="@string/payment_create_time"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
                 android:id="@+id/create_time"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
                 android:singleLine="true"