2024-05-13 修改

修改

1. 机票三字码界面调整

2. 日付申请界面调整

3. 导游地接资料界面调整

4. 保险费用录入界面调整

app/src/main/java/com/pan_american/android/OASystem.kt

@@ -90,7 +90,7 @@ class OASystem : Application() {
         })
 
         // 评分选择
-        val score = listOf("5", "4", "3", "2", "1")
+        val score = listOf("5", "4", "3", "2", "1", "0")
 
         // 星级选择
         val level = listOf("★★★★★", "★★★★", "★★★", "★★", "★", "无")

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

@@ -661,19 +661,6 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
 
     private fun addDailyPayment() {
 
-//        Log.e(
-//            "request", Gson().toJson(
-//                AddDailyPaymentRequest(
-//                    binding.paymentNotes.getText().trim(),
-//                    totalPayment,
-//                    transferIdentifyId,
-//                    feeSubTypeId,
-//                    companyId,
-//                    dailyPaymentList
-//                )
-//            )
-//        )
-
         apiService.addDailyPayment(
             AddDailyPaymentRequest(
                 binding.paymentNotes.getText().trim(),
@@ -694,9 +681,10 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
 
                         back()
                     } else {
-                        showMessage(baseResponse.msg)
 
                         binding.commit.setButtonStatus(0)
+
+                        showMessage(baseResponse.msg)
                     }
                 }
             }
@@ -793,20 +781,6 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
 
     private fun updateDailyPayment() {
 
-//        Log.e(
-//            "request", Gson().toJson(
-//                UpdateDailyPaymentRequest(
-//                    dailyPaymentId,
-//                    binding.paymentNotes.getText().trim(),
-//                    totalPayment,
-//                    transferIdentifyId,
-//                    feeSubTypeId,
-//                    companyId,
-//                    dailyPaymentList
-//                )
-//            )
-//        )
-
         apiService.updateDailyPaymentDetail(
             UpdateDailyPaymentRequest(
                 dailyPaymentId,
@@ -830,9 +804,10 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
 
                         back()
                     } else {
-                        showMessage(baseResponse.msg)
 
                         binding.commit.setButtonStatus(0)
+
+                        showMessage(baseResponse.msg)
                     }
                 }
             }

app/src/main/java/com/pan_american/android/ui/group_common/insurance_payment_insert/AddInsurancePaymentActivity.kt

@@ -110,7 +110,7 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
             if (fromList) {
                 titleText.text = resources.getString(R.string.insurance_payment_detail)
             } else {
-                titleText.text = resources.getString(R.string.insurance_payment_insert)
+                titleText.text = resources.getString(R.string.add_insurance_payment)
             }
 
             backButton.setOnClickListener {

app/src/main/java/com/pan_american/android/ui/resource_management/airplane_three_code/AddAirplaneThreeCodeActivity.kt

@@ -32,6 +32,7 @@ class AddAirplaneThreeCodeActivity : BaseActivity<ActivityAddAirplaneThreeCodeBi
 
         fromList = intent.getBooleanExtra("fromList", false)
 
+        initTitle()
         initViews()
         initEvents()
     }

app/src/main/java/com/pan_american/android/ui/resource_management/guide_resource/AddGuideResourceActivity.kt

@@ -2,7 +2,6 @@ package com.pan_american.android.ui.resource_management.guide_resource
 
 import android.os.Bundle
 import android.text.InputType
-import android.view.View
 import android.widget.RadioButton
 import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
@@ -68,7 +67,7 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
 
             guideResource = intent.getSerializableExtra("guideResource", GuideResource::class.java) as GuideResource
 
-            initGuideResourceInfo()
+            initGuideResourceDetail()
 
             binding.commit.setText(resources.getString(R.string.update))
 
@@ -241,14 +240,23 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
         }
     }
 
-    private fun initGuideResourceInfo() {
+    private fun initGuideResourceDetail() {
         binding.apply {
             for (item in OASystem.guideType) {
                 if (item.id == guideResource.staffType) {
                     guideType.text = item.name
+                    guideTypeId = item.id
                 }
             }
-            serviceScore.text = guideResource.score.toString()
+
+            //老数据没有选择评分，更新数据时需要选择评分
+            for (item in OASystem.score) {
+                if (guideResource.score.toString() == item) {
+                    serviceScore.text = item
+                    isChose = true
+                }
+            }
+
             unitArea.setText(guideResource.unitArea)
             departmentName.setText(guideResource.unitName)
             supplierLocation.setText(guideResource.address)
@@ -360,9 +368,10 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
                         back()
 
                     } else {
-                        showMessage(baseResponse.msg)
 
                         binding.commit.setButtonStatus(0)
+
+                        showMessage(baseResponse.msg)
                     }
                 }
             }

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

@@ -804,6 +804,7 @@
     <!-- 保险费用列表，错误信息 -->
     <string name="insurance_list_get_failed">获取保险费用列表失败</string>
 
+    <string name="add_insurance_payment">新增保险费用</string>
     <string name="insurance_payment_detail">保险费用详情</string>
 
     <string name="insurance_payment">保险费用</string>