Преглед изворни кода

2024-04-26 修改

新增

1. 日付费用申请,新增费用描述筛选

修改

1. 日付费用界面UI细微调整
zhaiy пре 11 месеци
родитељ
комит
b17fb5e255

+ 6 - 0
app/src/main/java/com/pan_american/android/ui/efficiency_tools/daily_payment/DailyPaymentListActivity.kt

@@ -328,6 +328,12 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
 
         binding.commit.setOnClickListener {
 
+            if (binding.paymentDescription.text.isNotBlank()) {
+                dailyPaymentListRequest.feeDesc = binding.paymentDescription.text.toString()
+            } else {
+                dailyPaymentListRequest.feeDesc = ""
+            }
+
             when (binding.financeDepartVerify.checkedRadioButtonId) {
                 binding.financeAll.id -> {
                     dailyPaymentListRequest.financialAuditStatus = -1

+ 41 - 6
app/src/main/res/layout/activity_daliy_payment_list.xml

@@ -133,6 +133,7 @@
                     android:id="@+id/create_user"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/common_padding"
                     android:gravity="end"
                     android:text="@string/all"
                     android:textColor="@color/text_color" />
@@ -154,14 +155,48 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:text="@string/payment_sketch"
+                    android:textSize="@dimen/text_size_small" />
+
+                <EditText
+                    android:id="@+id/payment_description"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/common_padding"
+                    android:background="@color/white"
+                    android:gravity="end"
+                    android:hint="@string/please_input"
+                    android:importantForAutofill="no"
+                    android:inputType="text"
+                    android:textColor="@color/text_color"
+                    android:textColorHint="@color/hint_text_color"
+                    android:textSize="@dimen/text_size_small" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="@dimen/common_padding"
+                android:layout_marginBottom="@dimen/common_padding"
+                android:background="@color/line_color" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
                     android:text="@string/finance_depart_verify"
-                    android:textSize="@dimen/text_size_small"
-                    android:layout_gravity="center"/>
+                    android:textSize="@dimen/text_size_small" />
 
                 <RadioGroup
                     android:id="@+id/finance_depart_verify"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/common_padding_heavy"
                     android:layout_marginStart="@dimen/common_padding_large"
                     android:gravity="center"
                     android:orientation="horizontal">
@@ -233,14 +268,14 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center"
                     android:text="@string/general_manager_verify"
-                    android:textSize="@dimen/text_size_small"
-                    android:layout_gravity="center"/>
+                    android:textSize="@dimen/text_size_small" />
 
                 <RadioGroup
                     android:id="@+id/general_manager_verify"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/common_padding_heavy"
                     android:layout_marginStart="@dimen/common_padding_large"
                     android:gravity="center"
                     android:orientation="horizontal">