2024-04-30 修改

新增

1. 日付费用申请列表界面，item新增字段 是否付款 项

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

@@ -1,6 +1,19 @@
 package com.pan_american.android.data.model.daily_payment.entity
 
-class DailyPaymentCardListItem(val id: Int, val companyId: Int, val companyName: String,
-                               val instructions: String, val sumPrice: Float, val createUserId: Int, val createUser: String,
-                               val createTime: String, val fAudit: Int, val fAuditDesc: String, val fAuditName: String,
-                               val mAudit: Int, val mAuditDesc: String, val mAuditName: String)
+class DailyPaymentCardListItem() {
+    var id = 0
+    var companyId = -1
+    var companyName = ""
+    var instructions = ""
+    var sumPrice = 0.0
+    var createUserId = -1
+    var createUser = ""
+    var createTime = ""
+    var fAudit = -1
+    var fAuditDesc = ""
+    var fAuditName = ""
+    var mAudit = -1
+    var mAuditDesc = ""
+    var mAuditName = ""
+    var isPay = -1
+}

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

@@ -528,6 +528,24 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
                             .setTextColor(Color.rgb(210, 45, 34))
                     }
                 }
+
+                when (data.isPay) {
+                    0 -> {
+                        itemView.findViewById<TextView>(R.id.is_pay).apply {
+                            text = resources.getString(R.string.not_pay)
+                            setTextColor(Color.rgb(23, 171, 227))
+                        }
+                        itemView.findViewById<ImageView>(R.id.is_pay_icon).setImageResource(R.mipmap.icon_wait)
+                    }
+
+                    1 -> {
+                        itemView.findViewById<TextView>(R.id.is_pay).apply {
+                            text = resources.getString(R.string.paid)
+                            setTextColor(Color.rgb(84, 213, 77))
+                        }
+                        itemView.findViewById<ImageView>(R.id.is_pay_icon).setImageResource(R.mipmap.icon_passed)
+                    }
+                }
             }
         }.create()
 

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

@@ -215,7 +215,8 @@
                         android:layout_gravity="center"
                         android:layout_marginStart="@dimen/common_padding_small"
                         android:layout_marginEnd="@dimen/common_padding"
-                        android:src="@mipmap/icon_passed" />
+                        android:src="@mipmap/icon_passed"
+                        tools:ignore="ContentDescription" />
 
                 </LinearLayout>
 
@@ -257,7 +258,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
-            android:layout_marginBottom="@dimen/common_padding"
             android:baselineAligned="false"
             android:orientation="horizontal">
 
@@ -294,7 +294,8 @@
                         android:layout_gravity="center"
                         android:layout_marginStart="@dimen/common_padding_small"
                         android:layout_marginEnd="@dimen/common_padding"
-                        android:src="@mipmap/icon_passed" />
+                        android:src="@mipmap/icon_passed"
+                        tools:ignore="ContentDescription" />
 
                 </LinearLayout>
 
@@ -325,6 +326,52 @@
 
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:layout_marginTop="@dimen/common_padding_huge"
+            android:layout_marginBottom="@dimen/common_padding"
+            android:background="@color/line_color" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/common_padding"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/is_pay"
+                android:textSize="@dimen/text_size_medium" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="end">
+
+                <TextView
+                    android:id="@+id/is_pay"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/verify_passed"
+                    android:textColor="@color/passed"
+                    android:textSize="@dimen/text_size_medium" />
+
+                <ImageView
+                    android:id="@+id/is_pay_icon"
+                    android:layout_width="@dimen/common_padding_huge"
+                    android:layout_height="@dimen/common_padding_huge"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="@dimen/common_padding_small"
+                    android:src="@mipmap/icon_passed"
+                    tools:ignore="ContentDescription" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
     </LinearLayout>
 
 </LinearLayout>

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

@@ -210,6 +210,9 @@
     <string name="verify_passed">已通过</string>
     <string name="verify_reject">未通过</string>
     <string name="rmb_price">%.2f RMB</string>
+    <string name="is_pay">是否付款</string>
+    <string name="paid">已付款</string>
+    <string name="not_pay">未付款</string>
 
     <string name="select_payment_type">请先选择费用类型</string>