2024-04-24 修改

修改:

1. 取消团组费用审批模块（仅设计界面时设计有）
2. 接团信息-客户名单，设置身份证号和手机号为非必填项
3. 接团信息-接团基本信息，自动生成团名称

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

@@ -174,7 +174,7 @@ class OASystem : Application() {
         const val DAILY_PAYMENT = 42
 
         // 团组费用审批模块
-        const val GROUP_PAYMENT = 47
+//        const val GROUP_PAYMENT = 47
 
         // 市场客户资源
         const val MARKET_CUSTOMER = 89

app/src/main/java/com/pan_american/android/ui/group_management/group_info/GroupCustomerDetailFragment.kt

@@ -312,20 +312,6 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
                     }
                 }
 
-                binding.phoneNumber.text.apply {
-                    if (isNullOrBlank()) {
-                        showMessage(resources.getString(R.string.phone_number_hint))
-                        return@setOnClickListener
-                    }
-                }
-
-                binding.idCard.text.apply {
-                    if (isNullOrBlank()) {
-                        showMessage(resources.getString(R.string.id_code_hint))
-                        return@setOnClickListener
-                    }
-                }
-
                 binding.customerBirthday.text.apply {
                     if (isNullOrBlank()) {
                         showMessage(resources.getString(R.string.birthday_hint))

app/src/main/java/com/pan_american/android/ui/group_management/group_info/GroupInfoBaseFragment.kt

@@ -1,6 +1,8 @@
 package com.pan_american.android.ui.group_management.group_info
 
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -223,6 +225,48 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
             }
         }
 
+        binding.customerDepartment.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+
+            }
+
+            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+
+            }
+
+            override fun afterTextChanged(p0: Editable?) {
+                initGroupName()
+            }
+        })
+
+        binding.visitCountry.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+
+            }
+
+            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+
+            }
+
+            override fun afterTextChanged(p0: Editable?) {
+                initGroupName()
+            }
+        })
+
+        binding.visitDays.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+
+            }
+
+            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+
+            }
+
+            override fun afterTextChanged(p0: Editable?) {
+                initGroupName()
+            }
+        })
+
         binding.visitDate.setOnClickListener {
             showDatePicker(resources.getString(R.string.visit_date), binding.visitDate) {}
         }
@@ -476,4 +520,10 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
                 .replace(R.id.add_group_info_container, GroupCustomerListFragment()).commit()
         }
     }
+
+    private fun initGroupName() {
+        if (binding.customerDepartment.text.isNotBlank() && binding.visitCountry.text.isNotBlank() && binding.visitDays.text.isNotBlank()) {
+            binding.groupName.setText(String.format(resources.getString(R.string.group_name_format), binding.customerDepartment.text, binding.visitCountry.text, binding.visitDays.text))
+        }
+    }
 }

app/src/main/java/com/pan_american/android/ui/workspace/WorkspaceFragment.kt

@@ -63,10 +63,10 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
                     binding.dailyPayment.setOnClickListener(this)
                 }
 
-                OASystem.GROUP_PAYMENT -> {
-                    binding.groupPayment.visibility = View.VISIBLE
-                    binding.groupPayment.setOnClickListener(this)
-                }
+//                OASystem.GROUP_PAYMENT -> {
+//                    binding.groupPayment.visibility = View.VISIBLE
+//                    binding.groupPayment.setOnClickListener(this)
+//                }
 
                 OASystem.MARKET_CUSTOMER -> {
                     if (binding.resourceManage.visibility == View.GONE) {
@@ -192,9 +192,9 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
                 startActivity(intent)
             }
 
-            binding.groupPayment.id -> {
-
-            }
+//            binding.groupPayment.id -> {
+//
+//            }
 
             binding.marketCustomerResource.id -> {
                 val intent = Intent(OASystem.context, MarketCustomerActivity::class.java)

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

@@ -187,11 +187,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/group_name"
+                    android:text="@string/client_name"
                     android:textSize="@dimen/text_size_medium" />
 
                 <EditText
-                    android:id="@+id/group_name"
+                    android:id="@+id/client_name"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_padding"
@@ -223,11 +223,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/client_name"
+                    android:text="@string/customer_company"
                     android:textSize="@dimen/text_size_medium" />
 
                 <EditText
-                    android:id="@+id/client_name"
+                    android:id="@+id/customer_department"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_padding"
@@ -259,11 +259,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/customer_company"
+                    android:text="@string/visit_country"
                     android:textSize="@dimen/text_size_medium" />
 
                 <EditText
-                    android:id="@+id/customer_department"
+                    android:id="@+id/visit_country"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_padding"
@@ -295,20 +295,18 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/visit_country"
+                    android:text="@string/visit_date"
                     android:textSize="@dimen/text_size_medium" />
 
-                <EditText
-                    android:id="@+id/visit_country"
+                <TextView
+                    android:id="@+id/visit_date"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_padding"
                     android:layout_weight="1"
                     android:background="@color/white"
                     android:gravity="end"
-                    android:hint="@string/please_input"
-                    android:importantForAutofill="no"
-                    android:inputType="text"
+                    android:hint="@string/please_select"
                     android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />
@@ -329,20 +327,23 @@
 
                 <TextView
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:text="@string/visit_date"
+                    android:text="@string/visit_days"
                     android:textSize="@dimen/text_size_medium" />
 
-                <TextView
-                    android:id="@+id/visit_date"
+                <EditText
+                    android:id="@+id/visit_days"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_padding"
                     android:layout_weight="1"
                     android:background="@color/white"
                     android:gravity="end"
-                    android:hint="@string/please_select"
+                    android:hint="@string/please_input"
+                    android:importantForAutofill="no"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true"
                     android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />
@@ -365,11 +366,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:text="@string/visit_days"
+                    android:text="@string/visit_members"
                     android:textSize="@dimen/text_size_medium" />
 
                 <EditText
-                    android:id="@+id/visit_days"
+                    android:id="@+id/visit_members"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_padding"
@@ -400,13 +401,13 @@
 
                 <TextView
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/visit_members"
+                    android:text="@string/group_name"
                     android:textSize="@dimen/text_size_medium" />
 
                 <EditText
-                    android:id="@+id/visit_members"
+                    android:id="@+id/group_name"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_padding"
@@ -415,8 +416,7 @@
                     android:gravity="end"
                     android:hint="@string/please_input"
                     android:importantForAutofill="no"
-                    android:inputType="number"
-                    android:selectAllOnFocus="true"
+                    android:inputType="text"
                     android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />

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

@@ -394,6 +394,7 @@
     <string name="pre_payment">预支付款项</string>
     <string name="op_percentage_level">OP提成等级</string>
     <string name="level_illustrate">等级说明</string>
+    <string name="group_name_format">%s赴%s%s日</string>
 
     <string name="visit_purpose">出访目的</string>
     <string name="special_demand">特殊需求</string>