2024-04-26 修改

修改:

1. 接团客户名单，性别，出生日期，设置为非必填

2. 市场客户资料，只能看自己的客户（张总除外），其它人无法筛选负责人

添加：

1. 市场客户资料，添加逻辑，若点击下一页，当前客户未填写单位或职位则提示

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>

.idea/gradle.xml

@@ -4,16 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

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

@@ -312,13 +312,6 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
                     }
                 }
 
-                binding.customerBirthday.text.apply {
-                    if (isNullOrBlank()) {
-                        showMessage(resources.getString(R.string.birthday_hint))
-                        return@setOnClickListener
-                    }
-                }
-
                 groupCustomerInfo.apply {
                     lastName = binding.lastName.text.toString()
                     firstName = binding.firstName.text.toString()

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

@@ -11,8 +11,8 @@ import com.pan_american.android.R
 import com.pan_american.android.base.BaseFragment
 import com.pan_american.android.base.CardAdapter
 import com.pan_american.android.base.CustomAlertDialog
-import com.pan_american.android.data.model.group_management.group_info.entity.GroupCustomerInfo
 import com.pan_american.android.data.model.common.entity.RequestCodeBean
+import com.pan_american.android.data.model.group_management.group_info.entity.GroupCustomerInfo
 import com.pan_american.android.databinding.FragmentGroupCustomerListBinding
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -108,10 +108,18 @@ class GroupCustomerListFragment : BaseFragment<FragmentGroupCustomerListBinding>
 
         binding.nextPage.setOnClickListener {
 
-//            if (OASystem.groupCustomerList.size == 0) {
-//                showMessage(resources.getString(R.string.customer_list_hint))
-//                return@setOnClickListener
-//            }
+            //2024-04-26 添加逻辑，若点击下一页，当前客户未填写单位或职位则提示
+            for ((i, item) in OASystem.groupCustomerList.withIndex()) {
+                if (item.companyFullName == resources.getString(R.string.no_info) || item.companyFullName.isBlank()) {
+                    showMessage(String.format(resources.getString(R.string.client_company_hint), i + 1))
+                    return@setOnClickListener
+                }
+
+                if (item.job.isBlank()) {
+                    showMessage(String.format(resources.getString(R.string.client_job_hint), i + 1))
+                    return@setOnClickListener
+                }
+            }
 
             parentFragmentManager.beginTransaction().setCustomAnimations(
                 R.anim.slide_right_in,

app/src/main/java/com/pan_american/android/ui/resource_management/market_customer/CustomerSiftFragment.kt

@@ -140,6 +140,12 @@ class CustomerSiftFragment : BaseFragment<FragmentCustomerFilterBinding>() {
         provincePage = binding.provincePage
 
         initServiceClass()
+
+        //2024-04-26 除张总外其它人无法筛选负责人
+
+        if (OASystem.userInfo.userId != 21) {
+            binding.director.visibility = View.GONE
+        }
     }
 
     override fun initEvents() {

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

@@ -121,6 +121,7 @@
                     android:layout_marginStart="@dimen/common_padding"
                     android:layout_weight="1"
                     android:background="@color/white"
+                    android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                     android:gravity="end"
                     android:hint="@string/please_input"
                     android:importantForAutofill="no"
@@ -291,7 +292,6 @@
                         android:layout_height="wrap_content"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:checked="true"
                         android:text="@string/male"
                         android:textColor="@color/text_color" />
 

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

@@ -459,6 +459,8 @@
     <string name="level_illustrate_hint">请选择等级说明</string>
 
     <string name="client_list_reset_alert">确认清空接团客户名单?</string>
+    <string name="client_company_hint">请完善第%d位客人的单位信息</string>
+    <string name="client_job_hint">请完善第%d位客人的职位信息</string>
     <string name="group_base_reset_alert">确认重置接团基础数据?</string>
 
     <!-- 团组商邀公务 -->