2024-05-10 修改

修改

1. 部分页面UI界面调整

2. 代码逻辑优化

3. 导游地接资料录入界面 补充必填提示

新增

1. 导游地接资料录入界面，新增导游地接资料类型 和 单位名称

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

@@ -80,6 +80,15 @@ class OASystem : Application() {
         //地接费用录入，单位list
         var unitList = ArrayList<Selector>()
 
+        //导游地接资料，导游地接类型
+        val guideType = listOf(Selector().apply {
+            id = 0
+            name = "公司"
+        }, Selector().apply {
+            id = 1
+            name = "个人"
+        })
+
         // 评分选择
         val score = listOf("5", "4", "3", "2", "1")
 

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/adapter/GroundConveyFooterAdapter.kt

@@ -21,7 +21,6 @@ class GroundConveyFooterAdapter: RecyclerView.Adapter<GroundConveyFooterAdapter.
 
     private var paymentWayStr = ""
 
-    //2024-04-28 新增OP费用录入详情审核通过后无法再进行修改
     private var canBeEdit = true
 
     lateinit var onItemClick: OnItemClick

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/adapter/GroundConveyHeaderAdapter.kt

@@ -15,7 +15,6 @@ class GroundConveyHeaderAdapter: RecyclerView.Adapter<GroundConveyHeaderAdapter.
 
     private var currencyCode = ""
 
-    //2024-04-28 新增OP费用录入详情审核通过后无法再进行修改
     private var canBeEdit = true
 
     lateinit var onItemClick: OnItemClick

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/adapter/GroundConveyListAdapter.kt

@@ -29,7 +29,6 @@ class GroundConveyListAdapter(private val groundConveyList: ArrayList<GroundConv
         val deleteButton : ImageView = view.findViewById(R.id.delete)
         val viewPaymentDetail: TextView = view.findViewById(R.id.payment_detail)
 
-        //2024-04-29 新增OP费用录入款项类型
         val priceType: TextView = view.findViewById(R.id.price_type)
     }
 
@@ -64,7 +63,6 @@ class GroundConveyListAdapter(private val groundConveyList: ArrayList<GroundConv
             holder.balancePayment.text = String.format("%.2f (%s)", remainingBalance, currencyStr)
             holder.serviceDuringTime.text = String.format("%s - %s", serviceStartTime, serviceEndTime)
 
-            //2024-04-29 新增OP费用录入款项类型
             holder.priceType.text = priceTypeStr
 
             when(isAuditGM) {

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/adapter/GroundConveyTableAdapter.kt

@@ -31,7 +31,6 @@ class GroundConveyTableAdapter(private val itemList: ArrayList<GroundConveyTable
 
     var count = ""
 
-    //2024-04-28 新增OP费用录入详情审核通过后无法再进行修改
     private var canBeEdit = true
 
     inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
@@ -160,7 +159,6 @@ class GroundConveyTableAdapter(private val itemList: ArrayList<GroundConveyTable
 
         holder.listItem.visibility = View.VISIBLE
 
-        //2024-04-30 OP费用录入若item是尾款或其它额外费用则不显示时间
         if (item.sId == 1070 || item.sId == 1071) {
             holder.date.text = "无"
         } else {

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/entity/GroundConveyListItem.kt

@@ -12,6 +12,5 @@ class GroundConveyListItem {
     var isAuditGM = -1
     var currencyStr = ""
 
-    //2024-04-29 新增OP费用录入款项类型
     var priceTypeStr = ""
 }

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/network/UpdateGroundConveyRequest.kt

@@ -21,9 +21,7 @@ class UpdateGroundConveyRequest {
     val createUserId = OASystem.userInfo.userId
     var remark = ""
 
-    //2024-04-29 新增OP费用录入 款项类型
     var priceType = 0
 
-    //2024-05-09 新增OP费用录入 费用名称
     var priceName = ""
 }

app/src/main/java/com/pan_american/android/data/model/group_visa/visa_payment_insert/entity/VisaPaymentListItem.kt

@@ -1,6 +1,5 @@
 package com.pan_american.android.data.model.group_visa.visa_payment_insert.entity
 
-//2024-04-26 添加签证描述
 class VisaPaymentListItem(val id: Int, val diId: Int, val visaDescription: String, val visaClient: String, val visaNumber: Int, val visaFreeNumber: Int,
                           val visaPrice: Double, val visaCurrencyStr: String, val isAuditGM: Int, val isThird: Int,
                           val createUserId: Int, val createTime: String, val remark: String)

app/src/main/java/com/pan_american/android/data/model/group_visa/visa_payment_insert/network/UpdateVisaPaymentRequest.kt

@@ -7,7 +7,6 @@ class UpdateVisaPaymentRequest {
     var status = 0
     var id = 0
     var diId = 0
-    //2024-04-26 添加签证描述
     var visaDescription = ""
     var visaClient = ""
     var visaPrice = 0.0

app/src/main/java/com/pan_american/android/data/model/group_visa/visa_payment_insert/network/VisaPaymentDetailResponse.kt

@@ -7,7 +7,6 @@ class VisaPaymentDetailResponse(val data: Data): BaseResponse() {
 
     inner class Data(val visaInfo: VisaInfo, val creditCardPayment: CardPaymentResource)
 
-    //2024-04-26 添加签证描述
     inner class VisaInfo(val diId: Int, val visaDescription: String, val visaClient: String, val visaPrice: Double, val visaCurrency: Int, val isThird: Int,
                          val passengerType: Int, val visaNumber: Int, val visaFreeNumber: Int, val id: Int, val createUserId: Int, val remark: String)
 }

app/src/main/java/com/pan_american/android/data/model/resource_management/guide_resource/entity/GuideResource.kt

@@ -5,6 +5,7 @@ import java.io.Serializable
 
 class GuideResource: Serializable {
 
+    var staffType = -1
     var unitArea = ""
     var unitName = ""
     var address = ""

app/src/main/java/com/pan_american/android/ui/group_airplane_ticket/airplane_payment_insert/AddAirplaneTicketActivity.kt

@@ -91,7 +91,6 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
 
     private val regex = Regex("^-?\\d+(\\.\\d{1,2})?\$")
 
-    //2024-04-26 机票费用 设置已审核费用不能修改
     private var isAuditGM = -1
 
     override fun getViewBinding() = ActivityAddAirplaneTicketBinding.inflate(layoutInflater)
@@ -109,7 +108,6 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
             binding.groupCustomer.text = getStringExtra("clientName")
             binding.visitCountry.text = getStringExtra("visitCountry")
 
-            //2024-04-26 机票费用 设置已审核费用不能修改
             isAuditGM = if (fromList) {
                 getIntExtra("isAuditGM", -1)
             } else {
@@ -145,7 +143,6 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
 
             binding.commit.text = resources.getString(R.string.update)
 
-            //2024-04-26 机票费用 设置已审核费用不能修改
             if (!canBeEdit()) {
                 binding.apply {
                     berthType.isEnabled = false
@@ -771,7 +768,6 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
 
         binding.commit.setOnClickListener {
 
-            //2024-04-26 机票费用 设置已审核费用不能修改
             if (!canBeEdit()) {
                 back()
                 return@setOnClickListener

app/src/main/java/com/pan_american/android/ui/group_airplane_ticket/airplane_payment_insert/AirplaneTicketListFragment.kt

@@ -345,7 +345,6 @@ class AirplaneTicketListFragment : BaseFragment<FragmentAirplaneTicketListBindin
                             putExtra("clientName", binding.groupCustomer.text)
                             putExtra("visitCountry", binding.visitCountry.text)
 
-                            //2024-04-26 机票费用 设置已审核费用不能修改
                             putExtra("isAuditGM", airplaneTicketList[position].isAuditGM)
                         }
                     startActivity(intent)

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

@@ -76,7 +76,6 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
 
     private var updateInsurancePaymentRequest = UpdateInsurancePaymentRequest()
 
-    //2024-04-28 设置保险费用录入，审核通过后无法修改
     private var isAuditGM = -1
 
     override fun getViewBinding() = ActivityAddInsurancePaymentBinding.inflate(layoutInflater)
@@ -93,7 +92,6 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
             binding.groupCustomer.text = getStringExtra("clientName")
             binding.visitCountry.text = getStringExtra("visitCountry")
 
-            //2024-04-28 设置保险费用录入，审核通过后无法修改
             isAuditGM = if (fromList) {
                 getIntExtra("isAuditGM", -1)
             } else {
@@ -155,7 +153,6 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
         } else {
             binding.commit.text = resources.getString(R.string.add)
 
-            //2024-04-25 保险费用录入默认支付方式为扫码支付
             for (item in paymentWayList) {
                 if (item.id == OASystem.PAYMENT_WAY_INSURANCE_ID) {
                     binding.paymentWay.text = item.name
@@ -164,7 +161,6 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
                 }
             }
 
-            //2024-04-26 保险费用录入费用类型默认为不选此项
             for (item in insuranceType) {
                 if (item.id == 2) {
                     binding.insuranceType.text = item.gName
@@ -587,8 +583,6 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
 
             updateInsurancePaymentRequest.paymentCurrency = currencyId
 
-            //2024-04-25 保险费用录入 收款方 为非必填项
-
             if (binding.payee.text.isNotBlank()) {
                 updateInsurancePaymentRequest.payee = binding.payee.text.trim().toString()
             }

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

@@ -289,7 +289,6 @@ class InsuranceListFragment : BaseFragment<FragmentInsuranceListBinding>() {
                             putExtra("clientName", binding.groupCustomer.text)
                             putExtra("visitCountry", binding.visitCountry.text)
 
-                            //2024-04-28 设置保险费用录入，审核通过后无法修改
                             putExtra("isAuditGM",insurancePaymentList[position].isAuditGM)
                         }
                     startActivity(intent)

app/src/main/java/com/pan_american/android/ui/group_hotel/hotel_predetermine/AddHotelPredetermineActivity.kt

@@ -166,7 +166,6 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
 
     private var hasCurrency = false
 
-    //2024-04-28 新增酒店费用录入审核后无法修改
     private var isAuditGM = -1
 
     override fun getViewBinding() = ActivityAddHotelPredetermineBinding.inflate(layoutInflater)
@@ -183,7 +182,6 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
             binding.groupCustomer.text = getStringExtra("clientName")
             binding.visitCountry.text = getStringExtra("visitCountry")
 
-            //2024-04-28 新增酒店费用录入审核后无法修改
             isAuditGM = if (fromList) {
                 getIntExtra("isAuditGM", -1)
             } else {
@@ -192,6 +190,7 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
         }
 
         initTitle()
+        initViews()
 
         getSelectorResource()
     }
@@ -202,7 +201,7 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
                 titleText.text = resources.getString(R.string.hotel_payment_detail)
             } else {
                 titleText.text = resources.getString(R.string.hotel_predetermine)
-                binding.commit.text = resources.getString(R.string.add)
+                binding.commit.setText(resources.getString(R.string.add))
             }
 
             backButton.setOnClickListener {
@@ -222,8 +221,6 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
         binding.cityTax.filters = arrayOf(MoneyInputFilter())
 
         if (fromList) {
-            getHotelPredetermineDetail()
-
             if (!canBeEdit()) {
                 binding.apply {
 
@@ -272,10 +269,10 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
                     paymentMark.isEnabled = false
                     paymentApplyNotes.isEnabled(false)
 
-                    commit.text = resources.getString(R.string.back)
+                    commit.setText(resources.getString(R.string.back))
                 }
             } else {
-                binding.commit.text = resources.getString(R.string.update)
+                binding.commit.setText(resources.getString(R.string.update))
             }
 
         } else {
@@ -1096,163 +1093,145 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
             updateHotelPredetermine.id = paymentId
             updateHotelPredetermine.diId = groupId
 
-            if (!customerTypeSelect) {
-                showMessage(resources.getString(R.string.customer_type_select_hint))
-                return@setOnClickListener
-            } else {
-                updateHotelPredetermine.gtId = customerTypeId
-            }
+            when {
+                !customerTypeSelect -> {
+                    showMessage(resources.getString(R.string.customer_type_select_hint))
+                }
 
-            if (!bankCardSelect) {
-                showMessage(resources.getString(R.string.bank_card_select_hint))
-                return@setOnClickListener
-            } else {
-                updateHotelPredetermine.ctdId = bankCardId
-                updateHotelPredetermine.bankNo = bankNumber
-                updateHotelPredetermine.cardholderName = binding.bankCardOwner.text.toString()
-            }
+                !bankCardSelect -> {
+                    showMessage(resources.getString(R.string.bank_card_select_hint))
+                }
 
-            if (!hasCurrency) {
-                showMessage(resources.getString(R.string.currency_not_set_hint))
-                return@setOnClickListener
-            }
+                !hasCurrency -> {
+                    showMessage(resources.getString(R.string.currency_not_set_hint))
+                }
 
-            if (!websiteSelect) {
-                showMessage(resources.getString(R.string.website_select_hint))
-                return@setOnClickListener
-            } else {
-                updateHotelPredetermine.reservationsWebsite = websiteId
-            }
+                !websiteSelect -> {
+                    showMessage(resources.getString(R.string.website_select_hint))
+                }
 
-            if (binding.hotelConfirmCode.text.isNullOrBlank()) {
-                showMessage(resources.getString(R.string.hotel_confirm_code_hint))
-                return@setOnClickListener
-            } else {
-                updateHotelPredetermine.determineNo = binding.hotelConfirmCode.text.toString()
-            }
+                binding.hotelConfirmCode.text.isNullOrBlank() -> {
+                    showMessage(resources.getString(R.string.hotel_confirm_code_hint))
+                }
 
-            if (binding.locatedCity.text.isNullOrBlank()) {
-                showMessage(resources.getString(R.string.hotel_located_input_hint))
-                return@setOnClickListener
-            } else {
-                updateHotelPredetermine.city = binding.locatedCity.text.toString()
-            }
+                binding.locatedCity.text.isNullOrBlank() -> {
+                    showMessage(resources.getString(R.string.hotel_located_input_hint))
+                }
 
-            if (binding.hotelName.text.isNullOrBlank()) {
-                showMessage(resources.getString(R.string.hotel_name_input_hint))
-                return@setOnClickListener
-            } else {
-                updateHotelPredetermine.hotelName = binding.hotelName.text.toString()
-            }
+                binding.hotelName.text.isNullOrBlank() -> {
+                    showMessage(resources.getString(R.string.hotel_name_input_hint))
+                }
 
-            if (binding.hotelTel.text.isNullOrBlank()) {
-                showMessage(resources.getString(R.string.hotel_tel_input_hint))
-                return@setOnClickListener
-            } else {
-                updateHotelPredetermine.hotelTel = binding.hotelTel.text.toString()
-            }
+                binding.hotelTel.text.isNullOrBlank() -> {
+                    showMessage(resources.getString(R.string.hotel_tel_input_hint))
+                }
 
-            binding.hotelLocation.getText().apply {
-                if (isNullOrBlank()) {
+                binding.hotelLocation.getText().isBlank() -> {
                     showMessage(resources.getString(R.string.hotel_address_input_hint))
-                    return@setOnClickListener
-                } else {
-                    updateHotelPredetermine.hotelAddress = binding.hotelLocation.getText()
                 }
-            }
 
-            if (customerSelectList.size == 0) {
-                showMessage(resources.getString(R.string.customer_select_hint))
-                return@setOnClickListener
-            } else {
-                var i = 0
-                var guestName = ""
-                while (i < customerSelectList.size) {
+                customerSelectList.size == 0 -> {
+                    showMessage(resources.getString(R.string.customer_select_hint))
+                }
 
-                    guestName += customerSelectList[i].id
-                    i += 1
+                binding.checkInStartTime.text.isNullOrBlank() -> {
+                    showMessage(resources.getString(R.string.check_in_start_select_hint))
+                }
 
-                    if (i < customerSelectList.size) {
-                        guestName += ","
-                    }
+                binding.checkInEndTime.text.isNullOrBlank() -> {
+                    showMessage(resources.getString(R.string.check_in_end_select_hint))
                 }
 
-                updateHotelPredetermine.guestName = guestName
-            }
+                !checkInTypeSelect -> {
+                    showMessage(resources.getString(R.string.check_in_type_select_hint))
+                }
 
-            if (binding.checkInStartTime.text.isNullOrBlank()) {
-                showMessage(resources.getString(R.string.check_in_start_select_hint))
-                return@setOnClickListener
-            } else {
-                updateHotelPredetermine.checkInDate = binding.checkInStartTime.text.toString()
-            }
+                binding.roomIntroduction.getText().isBlank() -> {
+                    showMessage(resources.getString(R.string.room_introduction_hint))
+                }
 
-            if (binding.checkInEndTime.text.isNullOrBlank()) {
-                showMessage(resources.getString(R.string.check_in_end_select_hint))
-                return@setOnClickListener
-            } else {
-                updateHotelPredetermine.checkOutDate = binding.checkInEndTime.text.toString()
-            }
+                else -> {
+                    updateHotelPredetermine.gtId = customerTypeId
 
-            if (checkInTypeSelect) {
-                updateHotelPredetermine.checkType = checkInTypeId
-            } else {
-                showMessage(resources.getString(R.string.check_in_type_select_hint))
-                return@setOnClickListener
-            }
+                    updateHotelPredetermine.ctdId = bankCardId
+                    updateHotelPredetermine.bankNo = bankNumber
+                    updateHotelPredetermine.cardholderName = binding.bankCardOwner.text.toString()
 
-            binding.roomIntroduction.getText().apply {
-                if (isNullOrBlank()) {
-                    showMessage(resources.getString(R.string.room_introduction_hint))
-                    return@setOnClickListener
-                } else {
-                    updateHotelPredetermine.roomExplanation = this
-                }
-            }
+                    updateHotelPredetermine.reservationsWebsite = websiteId
 
-            binding.hotelNotes.getText().apply {
-                if (isNotBlank()) {
-                    updateHotelPredetermine.hotelRemark = this
-                }
-            }
+                    updateHotelPredetermine.determineNo = binding.hotelConfirmCode.text.toString()
 
-            updateHotelPredetermine.singleRoomCount = singleRoomCount
+                    updateHotelPredetermine.city = binding.locatedCity.text.toString()
 
-            updateHotelPredetermine.singleRoomPrice = singleRoomUnitPrice
+                    updateHotelPredetermine.hotelName = binding.hotelName.text.toString()
 
-            updateHotelPredetermine.doubleRoomCount = doubleRoomCount
+                    updateHotelPredetermine.hotelTel = binding.hotelTel.text.toString()
 
-            updateHotelPredetermine.doubleRoomPrice = doubleRoomUnitPrice
+                    updateHotelPredetermine.hotelAddress = binding.hotelLocation.getText()
 
-            updateHotelPredetermine.suiteRoomCount = suiteRoomCount
+                    var i = 0
+                    var guestName = ""
+                    while (i < customerSelectList.size) {
 
-            updateHotelPredetermine.suiteRoomPrice = suiteRoomUnitPrice
+                        guestName += customerSelectList[i].id
+                        i += 1
 
-            updateHotelPredetermine.otherRoomCount = otherRoomCount
+                        if (i < customerSelectList.size) {
+                            guestName += ","
+                        }
+                    }
 
-            updateHotelPredetermine.otherRoomPrice = otherRoomUnitPrice
+                    updateHotelPredetermine.guestName = guestName
 
-            updateHotelPredetermine.cardPrice = creditPayment
+                    updateHotelPredetermine.checkInDate = binding.checkInStartTime.text.toString()
 
-            updateHotelPredetermine.governmentRent = localTax
+                    updateHotelPredetermine.checkOutDate = binding.checkInEndTime.text.toString()
 
-            updateHotelPredetermine.governmentRentCurrency = localTaxUnitId
+                    updateHotelPredetermine.checkType = checkInTypeId
 
-            updateHotelPredetermine.cityTax = cityTax
+                    updateHotelPredetermine.roomExplanation = binding.roomIntroduction.getText()
 
-            updateHotelPredetermine.cityTaxCurrency = cityTaxUnitId
+                    updateHotelPredetermine.hotelRemark = binding.hotelNotes.getText()
 
-            updateHotelPredetermine.breakfastPrice = breakfastPrice
+                    updateHotelPredetermine.singleRoomCount = singleRoomCount
 
-            updateHotelPredetermine.breakfastCurrency = breakfastUnitId
+                    updateHotelPredetermine.singleRoomPrice = singleRoomUnitPrice
 
-            when (binding.breakfastOpPay.checkedRadioButtonId) {
-                binding.yes.id -> {
-                    updateHotelPredetermine.isOpPay = 1
-                }
+                    updateHotelPredetermine.doubleRoomCount = doubleRoomCount
+
+                    updateHotelPredetermine.doubleRoomPrice = doubleRoomUnitPrice
+
+                    updateHotelPredetermine.suiteRoomCount = suiteRoomCount
+
+                    updateHotelPredetermine.suiteRoomPrice = suiteRoomUnitPrice
 
-                binding.no.id -> {
-                    updateHotelPredetermine.isOpPay = 0
+                    updateHotelPredetermine.otherRoomCount = otherRoomCount
+
+                    updateHotelPredetermine.otherRoomPrice = otherRoomUnitPrice
+
+                    updateHotelPredetermine.cardPrice = creditPayment
+
+                    updateHotelPredetermine.governmentRent = localTax
+
+                    updateHotelPredetermine.governmentRentCurrency = localTaxUnitId
+
+                    updateHotelPredetermine.cityTax = cityTax
+
+                    updateHotelPredetermine.cityTaxCurrency = cityTaxUnitId
+
+                    updateHotelPredetermine.breakfastPrice = breakfastPrice
+
+                    updateHotelPredetermine.breakfastCurrency = breakfastUnitId
+
+                    when (binding.breakfastOpPay.checkedRadioButtonId) {
+                        binding.yes.id -> {
+                            updateHotelPredetermine.isOpPay = 1
+                        }
+
+                        binding.no.id -> {
+                            updateHotelPredetermine.isOpPay = 0
+                        }
+                    }
                 }
             }
 
@@ -1363,6 +1342,8 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
                         updateHotelPredetermine.ccpRemark = this
                     }
                 }
+            } else {
+                showMessage(resources.getString(R.string.payment_way_hint))
             }
 
             updateHotelPredetermine()
@@ -1409,7 +1390,9 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
                                 customerList.add(item)
                             }
 
-                            initViews()
+                            if (fromList) {
+                                getHotelPredetermineDetail()
+                            }
 
                         } else {
                             showMessage(resourceResponse.msg)
@@ -1458,11 +1441,7 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
 
     private fun updateHotelPredetermine() {
 
-        binding.commit.isEnabled = false
-
-        binding.commit.visibility = View.GONE
-
-        binding.updateLoading.visibility = View.VISIBLE
+        binding.commit.setButtonStatus(1)
 
         apiService.updateHotelPredetermine(updateHotelPredetermine)
             .enqueue(object : Callback<BaseResponse> {
@@ -1485,6 +1464,9 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
                             back()
 
                         } else {
+
+                            binding.commit.setButtonStatus(0)
+
                             showMessage(baseResponse.msg)
                         }
                     }
@@ -1492,11 +1474,7 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
 
                 override fun onFailure(call: Call<BaseResponse>, t: Throwable) {
 
-                    binding.commit.isEnabled = true
-
-                    binding.commit.visibility = View.VISIBLE
-
-                    binding.updateLoading.visibility = View.GONE
+                    binding.commit.setButtonStatus(0)
 
                     showErrorInfo(R.string.update_error)
                 }

app/src/main/java/com/pan_american/android/ui/group_hotel/hotel_predetermine/HotelPredetermineListFragment.kt

@@ -238,7 +238,6 @@ class HotelPredetermineListFragment : BaseFragment<FragmentHotelPredetermineList
                             putExtra("clientName", binding.groupCustomer.text)
                             putExtra("visitCountry", binding.visitCountry.text)
 
-                            //2024-04-28 新增酒店费用录入审核后无法修改
                             putExtra("isAuditGM", hotelPredetermineList[position].isAuditGM)
                         }
                     startActivity(intent)

app/src/main/java/com/pan_american/android/ui/group_invite_official/invite_official_payment_insert/AddInvitePaymentActivity.kt

@@ -92,7 +92,6 @@ class AddInvitePaymentActivity : BaseActivity<ActivityAddInvitePaymentBinding>()
 
     private lateinit var updateInviteOfficialRequest: UpdateInviteOfficialRequest
 
-    //2024-04-28 新增邀请公务费用审核后无法修改
     private var isAudit = -1
 
     override fun getViewBinding() = ActivityAddInvitePaymentBinding.inflate(layoutInflater)
@@ -115,7 +114,6 @@ class AddInvitePaymentActivity : BaseActivity<ActivityAddInvitePaymentBinding>()
             if (fromList) {
                 binding.inviteUnit.text = getStringExtra("currency")
 
-                //2024-04-28 新增邀请公务费用审核后无法修改
                 isAudit = getIntExtra("isAudit", -1)
             } else {
                 isAudit = 0

app/src/main/java/com/pan_american/android/ui/group_invite_official/invite_official_payment_insert/GroupInvitePaymentListFragment.kt

@@ -362,7 +362,6 @@ class GroupInvitePaymentListFragment : BaseFragment<FragmentGroupInvitePaymentLi
 
                             putExtra("currency", inviteOfficialList[position].currency)
 
-                            //2024-04-28 新增邀请公务费用审核后无法修改
                             putExtra("isAudit", inviteOfficialList[position].isAudit)
                         }
                     startActivity(intent)

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

@@ -108,7 +108,6 @@ class GroupCustomerListFragment : BaseFragment<FragmentGroupCustomerListBinding>
 
         binding.nextPage.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))

app/src/main/java/com/pan_american/android/ui/group_op/ground_convey_payment_insert/AddGroundConveyInfoActivity.kt

@@ -54,10 +54,8 @@ class AddGroundConveyInfoActivity : BaseActivity<ActivityAddGroupOpPaymentBindin
 
     private var updateGroundConveyRequest = UpdateGroundConveyRequest()
 
-    //2024-04-28 新增OP费用录入信息审核通过后无法再进行修改
     private var isAuditGM = -1
 
-    //2024-04-29 新增OP费用录入 款项类型（预付款 / 尾款）
     private var priceTypeList = ArrayList<Selector>()
 
     private var priceTypeId = -1
@@ -77,7 +75,6 @@ class AddGroundConveyInfoActivity : BaseActivity<ActivityAddGroupOpPaymentBindin
             binding.groupCustomer.text = getStringExtra("clientName")
             binding.visitCountry.text = getStringExtra("visitCountry")
 
-            //2024-04-28 新增OP费用录入信息审核通过后无法再进行修改
             isAuditGM = if (fromList) {
                 getIntExtra("isAuditGM", -1)
             } else {
@@ -353,7 +350,6 @@ class AddGroundConveyInfoActivity : BaseActivity<ActivityAddGroupOpPaymentBindin
             updateGroundConveyRequest.id = paymentId
             updateGroundConveyRequest.diId = groupId
 
-            //2024-05-09 新增OP费用录入 费用名称
             if (binding.paymentName.text.isNullOrBlank()) {
                 showMessage(resources.getString(R.string.payment_name_input_hint))
                 return@setOnClickListener
@@ -499,7 +495,6 @@ class AddGroundConveyInfoActivity : BaseActivity<ActivityAddGroupOpPaymentBindin
 
                             updateGroundConveyRequest.apply {
 
-                                //2024-05-09 新增OP费用录入 费用名称
                                 binding.paymentName.setText(priceName)
 
                                 //匹配旧数据
@@ -521,7 +516,6 @@ class AddGroundConveyInfoActivity : BaseActivity<ActivityAddGroupOpPaymentBindin
                                     }
                                 }
 
-                                //2024-04-29 新增OP费用录入款项类型
                                 for (item in priceTypeList) {
                                     if (priceType == item.id) {
                                         priceTypeId = item.id
@@ -616,7 +610,6 @@ class AddGroundConveyInfoActivity : BaseActivity<ActivityAddGroupOpPaymentBindin
         return OASystem.authorization(OASystem.GROUND_CONVEY_PAYMENT_INSERT, OASystem.EDIT) and (isAuditGM == 0)
     }
 
-    //2024-04-29 同步web修改，添加费用标识（尾款 / 预付款）
     private fun getPriceType() {
         apiService.querySetData(QuerySetDataRequest(83)).enqueue(object : Callback<SelectorResponse> {
             override fun onResponse(

app/src/main/java/com/pan_american/android/ui/group_op/ground_convey_payment_insert/GroundConveyPaymentDetailActivity.kt

@@ -80,10 +80,8 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
 
     private val updateGroundConveyDetailRequest = UpdateGroundConveyDetailRequest()
 
-    //2024-04-28 新增OP费用录入详情审核通过后无法再进行修改
     private var isAuditGM = -1
 
-    //2024-04-29 优化地接费用录入存在的卡顿问题
     private var showItemList = ArrayList<GroundConveyTableItem>()
 
     private var itemMaxId = 0
@@ -124,7 +122,6 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
             binding.commit.text = resources.getString(R.string.back)
         }
 
-        //2024-04-28 新增OP费用录入详情审核通过后无法再进行修改
         headerAdapter.setCanBeEdit(canBeEdit())
         footerAdapter.setCanBeEdit(canBeEdit())
 

app/src/main/java/com/pan_american/android/ui/group_op/ground_convey_payment_insert/GroundConveyPaymentListFragment.kt

@@ -233,7 +233,6 @@ class GroundConveyPaymentListFragment : BaseFragment<FragmentGroupOpPaymentListB
                             putExtra("clientName", binding.groupCustomer.text)
                             putExtra("visitCountry", binding.visitCountry.text)
 
-                            //2024-04-28 新增OP费用录入信息审核通过后无法再进行修改
                             putExtra("isAuditGM", groundConveyPaymentList[position].isAuditGM)
                         }
                     startActivity(intent)
@@ -265,7 +264,6 @@ class GroundConveyPaymentListFragment : BaseFragment<FragmentGroupOpPaymentListB
                         putExtra("paymentId", groundConveyPaymentList[position].id)
                         putExtra("teamName", binding.groupName.text)
 
-                        //2024-04-28 新增OP费用录入详情审核通过后无法再进行修改
                         putExtra("isAuditGM", groundConveyPaymentList[position].isAuditGM)
                     }
 

app/src/main/java/com/pan_american/android/ui/group_visa/visa_payment_insert/AddVisaPaymentActivity.kt

@@ -77,7 +77,6 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
 
     private var updateVisaPaymentRequest = UpdateVisaPaymentRequest()
 
-    //2024-04-28 新增签证费用录入审核通过后无法再修改
     private var isAuditGM = -1
 
     override fun getViewBinding() = ActivityAddVisaPaymentBinding.inflate(layoutInflater)
@@ -99,7 +98,6 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
                 binding.priceUnit.text = getStringExtra("paymentCurrency")
                 binding.sumUnit.text = getStringExtra("paymentCurrency")
 
-                //2024-04-28 新增签证费用录入审核通过后无法再修改
                 isAuditGM = getIntExtra("isAuditGM", -1)
             } else {
                 isAuditGM = 0
@@ -171,8 +169,6 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
         } else {
             binding.commit.text = resources.getString(R.string.add)
 
-            //2024-4-25 新增时默认选中所有客户
-
             initCustomerList()
 
             binding.visaHandleNumber.setText(customerSelectList.size.toString())
@@ -462,7 +458,6 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
             updateVisaPaymentRequest.id = paymentId
             updateVisaPaymentRequest.diId = groupId
 
-            //2024-04-26 添加签证描述
             if (binding.visaDescription.getText().isBlank()) {
                 showMessage(resources.getString(R.string.visa_description_hint))
                 return@setOnClickListener
@@ -645,8 +640,6 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
                 }
             }
 
-            //2024-04-25 签证费用录入 收款方 为非必填项
-
             if (binding.payee.text.isNotBlank()) {
                 updateVisaPaymentRequest.payee = binding.payee.text.trim().toString()
             }
@@ -726,7 +719,6 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
                             for (item in customerListResponse.data) {
                                 customerList.add(item)
 
-                                //2024-4-25 新增时默认选中所有客户
                                 if (!fromList) {
                                     customerSelectList.add(item)
                                 }
@@ -821,7 +813,6 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
                     if (visaPaymentDetailResponse != null) {
                         if (visaPaymentDetailResponse.code == 200) {
 
-                            //2024-04-26 添加签证描述
                             binding.visaDescription.setText(visaPaymentDetailResponse.data.visaInfo.visaDescription)
 
                             val customer =

app/src/main/java/com/pan_american/android/ui/group_visa/visa_payment_insert/VisaPaymentListFragment.kt

@@ -212,8 +212,6 @@ class VisaPaymentListFragment : BaseFragment<FragmentVisaPaymentListBinding>() {
             setCanDelete(OASystem.authorization(OASystem.VISA_PAYMENT_INSERT, OASystem.DELETE))
             addBindView { itemView, data ->
 
-                ////2024-04-26 添加签证描述，匹配老数据避免报错
-
                 if (data.visaDescription.isBlank()) {
                     val clientList = data.visaClient.trim().split("[*TuT*]")
 
@@ -298,7 +296,6 @@ class VisaPaymentListFragment : BaseFragment<FragmentVisaPaymentListBinding>() {
 
                             putExtra("paymentCurrency", visaPaymentList[position].visaCurrencyStr)
 
-                            //2024-04-28 新增签证费用录入审核通过后无法再修改
                             putExtra("isAuditGM", visaPaymentList[position].isAuditGM)
                         }
                     startActivity(intent)

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

@@ -11,6 +11,7 @@ import com.pan_american.android.R
 import com.pan_american.android.base.BaseActivity
 import com.pan_american.android.base.BaseResponse
 import com.pan_american.android.base.ListAdapter
+import com.pan_american.android.data.model.common.entity.Selector
 import com.pan_american.android.data.model.resource_management.guide_resource.entity.GuideResource
 import com.pan_american.android.data.network.APIService
 import com.pan_american.android.data.network.ServiceCreator
@@ -30,6 +31,8 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
 
     private var isChose = false
 
+    private var guideTypeId = -1
+
     override fun getViewBinding() = ActivityAddGuideResourceBinding.inflate(layoutInflater)
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -64,17 +67,101 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
         if (fromList) {
 
             guideResource = intent.getSerializableExtra("guideResource", GuideResource::class.java) as GuideResource
-            binding.commit.text = resources.getString(R.string.update)
+
+            binding.commit.setText(resources.getString(R.string.update))
+
+            if (!OASystem.authorization(OASystem.GUIDE_RESOURCE, OASystem.EDIT)) {
+                binding.apply {
+                    guideType.isEnabled = false
+                    serviceScore.isEnabled = false
+                    unitArea.isEnabled = false
+                    departmentName.isEnabled = false
+                    supplierLocation.setInputType(InputType.TYPE_NULL)
+                    contactsName.isEnabled = false
+                    contactsPhone.isEnabled = false
+                    contactsEmail.isEnabled = false
+                    contactsFax.isEnabled = false
+                    otherInfo.isEnabled(false)
+
+                    dressA.isEnabled = false
+                    dressB.isEnabled = false
+                    dressC.isEnabled = false
+
+                    awarenessA.isEnabled = false
+                    awarenessB.isEnabled = false
+                    awarenessC.isEnabled = false
+
+                    expertiseA.isEnabled = false
+                    expertiseB.isEnabled = false
+                    expertiseC.isEnabled = false
+
+                    timeConceptA.isEnabled = false
+                    timeConceptB.isEnabled = false
+                    timeConceptC.isEnabled = false
+
+                    cooperationA.isEnabled = false
+                    cooperationB.isEnabled = false
+                    cooperationC.isEnabled = false
+
+                    adaptabilityA.isEnabled = false
+                    adaptabilityB.isEnabled = false
+                    adaptabilityC.isEnabled = false
+
+                    expressionA.isEnabled = false
+                    expressionB.isEnabled = false
+                    expressionC.isEnabled = false
+
+                    commit.setText(resources.getString(R.string.back))
+                }
+            }
+
             initGuideResourceInfo()
 
         } else {
 
+            binding.commit.setText(resources.getString(R.string.add))
+
             guideResource = GuideResource()
         }
     }
 
     override fun initEvents() {
 
+        binding.guideType.setOnClickListener {
+            showSelector {
+                val adapter = ListAdapter.Builder<Selector>().apply {
+                    setData(OASystem.guideType)
+                    setLayoutId(R.layout.item_selector)
+                    addBindView { itemView, data ->
+                        itemView.findViewById<TextView>(R.id.selector_item_name).apply {
+                            text = data.name
+
+                            if (guideTypeId == data.id) {
+                                setTextColor(ResourcesCompat.getColor(resources, R.color.text_color_blue, null))
+                            } else {
+                                setTextColor(ResourcesCompat.getColor(resources, R.color.text_color, null))
+                            }
+                        }
+                    }
+                }.create()
+
+                selector.adapter = adapter
+
+                adapter.onRecyclerViewItemClick =
+                    object : ListAdapter.OnRecyclerViewItemClick<Selector> {
+                        override fun onItemClick(position: Int) {
+
+                            OASystem.guideType[position].apply {
+                                binding.guideType.text = name
+                                guideTypeId = id
+                            }
+
+                            popupWindow.dismiss()
+                        }
+                    }
+            }
+        }
+
         binding.serviceScore.setOnClickListener {
             showSelector {
                 val adapter = ListAdapter.Builder<String>().apply {
@@ -98,34 +185,66 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
                 adapter.onRecyclerViewItemClick =
                     object : ListAdapter.OnRecyclerViewItemClick<String> {
                         override fun onItemClick(position: Int) {
-                            popupWindow.dismiss()
                             binding.serviceScore.text = OASystem.score[position]
                             isChose = true
+
+                            popupWindow.dismiss()
                         }
                     }
             }
         }
 
         binding.commit.setOnClickListener {
-            if (fromList) {
-                initGuideResource(2)
-                updateGuideResourceInfo()
-            } else {
-                if (isChose) {
-                    initGuideResource(1)
-                    updateGuideResourceInfo()
-                } else {
+
+            when {
+                guideTypeId == -1 -> {
+                    showMessage(resources.getString(R.string.guide_type_select_hint))
+                }
+
+                !isChose -> {
                     showMessage(resources.getString(R.string.score_select_hint))
                 }
+
+                binding.unitArea.text.isNullOrBlank() -> {
+                    showMessage(resources.getString(R.string.department_location_input_hint))
+                }
+
+                binding.departmentName.text.isNullOrBlank() -> {
+                    showMessage(resources.getString(R.string.department_name_hint))
+                }
+
+                binding.contactsName.text.isNullOrBlank() -> {
+                    showMessage(resources.getString(R.string.connector_name_input_hint))
+                }
+
+                binding.contactsPhone.text.isNullOrBlank() -> {
+                    showMessage(resources.getString(R.string.connector_phone_input_hint))
+                }
+
+                else -> {
+
+                    if (fromList) {
+                        initGuideResource(2)
+                        updateGuideResourceInfo()
+                    } else {
+                        initGuideResource(1)
+                        updateGuideResourceInfo()
+                    }
+                }
             }
         }
     }
 
     private fun initGuideResourceInfo() {
         binding.apply {
-            guideResourceName.setText(guideResource.unitName)
+            for (item in OASystem.guideType) {
+                if (item.id == guideResource.staffType) {
+                    guideType.text = item.name
+                }
+            }
             serviceScore.text = guideResource.score.toString()
             unitArea.setText(guideResource.unitArea)
+            departmentName.setText(guideResource.unitName)
             supplierLocation.setText(guideResource.address)
             contactsName.setText(guideResource.contact)
             contactsPhone.setText(guideResource.contactTel)
@@ -175,51 +294,6 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
             "B" -> binding.expressionB.isChecked = true
             "C" -> binding.expressionC.isChecked = true
         }
-
-        if (!OASystem.authorization(OASystem.GUIDE_RESOURCE, OASystem.EDIT)) {
-            binding.apply {
-                guideResourceName.inputType = InputType.TYPE_NULL
-                serviceScore.isEnabled = false
-                unitArea.inputType = InputType.TYPE_NULL
-                supplierLocation.setInputType(InputType.TYPE_NULL)
-                contactsName.inputType = InputType.TYPE_NULL
-                contactsPhone.inputType = InputType.TYPE_NULL
-                contactsEmail.inputType = InputType.TYPE_NULL
-                contactsFax.inputType = InputType.TYPE_NULL
-                otherInfo.setInputType(InputType.TYPE_NULL)
-                otherInfo.setSingleLine(false)
-
-                dressA.isEnabled = false
-                dressB.isEnabled = false
-                dressC.isEnabled = false
-
-                awarenessA.isEnabled = false
-                awarenessB.isEnabled = false
-                awarenessC.isEnabled = false
-
-                expertiseA.isEnabled = false
-                expertiseB.isEnabled = false
-                expertiseC.isEnabled = false
-
-                timeConceptA.isEnabled = false
-                timeConceptB.isEnabled = false
-                timeConceptC.isEnabled = false
-
-                cooperationA.isEnabled = false
-                cooperationB.isEnabled = false
-                cooperationC.isEnabled = false
-
-                adaptabilityA.isEnabled = false
-                adaptabilityB.isEnabled = false
-                adaptabilityC.isEnabled = false
-
-                expressionA.isEnabled = false
-                expressionB.isEnabled = false
-                expressionC.isEnabled = false
-
-                commit.text = resources.getString(R.string.back)
-            }
-        }
     }
 
     /**
@@ -228,7 +302,8 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
 
     private fun initGuideResource(type: Int) {
         guideResource.apply {
-            unitName = binding.guideResourceName.text.toString()
+            staffType = guideTypeId
+            unitName = binding.departmentName.text.toString()
             score = binding.serviceScore.text.toString().toInt()
             unitArea = binding.unitArea.text.toString()
             address = binding.supplierLocation.getText()
@@ -259,11 +334,7 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
 
     private fun updateGuideResourceInfo() {
 
-        binding.commit.isEnabled = false
-
-        binding.commit.visibility = View.GONE
-
-        binding.updateLoading.visibility = View.VISIBLE
+        binding.commit.setButtonStatus(1)
 
         val apiService = ServiceCreator.create<APIService>()
 
@@ -285,22 +356,14 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
                     } else {
                         showMessage(baseResponse.msg)
 
-                        binding.commit.isEnabled = true
-
-                        binding.commit.visibility = View.VISIBLE
-
-                        binding.updateLoading.visibility = View.GONE
+                        binding.commit.setButtonStatus(0)
                     }
                 }
             }
 
             override fun onFailure(call: Call<BaseResponse>, t: Throwable) {
 
-                binding.commit.isEnabled = true
-
-                binding.commit.visibility = View.VISIBLE
-
-                binding.updateLoading.visibility = View.GONE
+                binding.commit.setButtonStatus(0)
 
                 showErrorInfo(R.string.update_error)
             }

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

@@ -84,6 +84,8 @@ class GuideResourceSearchFragment : BaseFragment<FragmentGuideResourceSearchBind
         } else {
             binding.departmentLocation.text = resources.getString(R.string.all)
         }
+
+        binding.commit.setText(resources.getString(R.string.search))
     }
 
     override fun initEvents() {

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

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

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

@@ -323,8 +323,6 @@ class MarketCustomerActivity : BaseActivity<ActivityMarketCustomerBinding>() {
                                     marketCustomerListItemList.add(item)
                                 }
 
-                                //2024-04-26 市场客户资料，当列表为空时弹出提示 暂无数据
-
                                 if (marketCustomerListItemList.size == 0) {
                                     showMessage(resources.getString(R.string.no_data))
                                     return

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

@@ -35,23 +35,22 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/guide_resource_name"
+                    android:text="@string/guide_resource_name_type"
                     android:textSize="@dimen/text_size_medium" />
 
-                <EditText
-                    android:id="@+id/guide_resource_name"
+                <TextView
+                    android:id="@+id/guide_type"
                     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:singleLine="true"
                     android:textColorHint="@color/hint_text_color"
-                    android:textSize="@dimen/text_size_medium" />
+                    android:textSize="@dimen/text_size_medium"
+                    android:textColor="@color/text_color" />
             </LinearLayout>
 
             <View
@@ -126,6 +125,42 @@
                     android:textSize="@dimen/text_size_medium" />
             </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/department_name"
+                    android:textSize="@dimen/text_size_medium" />
+
+                <EditText
+                    android:id="@+id/department_name"
+                    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:singleLine="true"
+                    android:textColorHint="@color/hint_text_color"
+                    android:textSize="@dimen/text_size_medium" />
+            </LinearLayout>
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"
@@ -912,15 +947,10 @@
                 android:background="@drawable/shape_corner_solid_blue"
                 android:orientation="horizontal">
 
-                <TextView
+                <com.pan_american.android.util.CommitButton
                     android:id="@+id/commit"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:text="@string/add"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_size_large"
-                    android:textStyle="bold" />
+                    android:layout_height="match_parent" />
 
                 <ProgressBar
                     android:id="@+id/update_loading"

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

@@ -2200,15 +2200,10 @@
                 android:background="@drawable/shape_corner_solid_blue"
                 android:orientation="horizontal">
 
-                <TextView
+                <com.pan_american.android.util.CommitButton
                     android:id="@+id/commit"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:text="@string/add"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_size_large"
-                    android:textStyle="bold" />
+                    android:layout_height="match_parent" />
 
                 <ProgressBar
                     android:id="@+id/update_loading"

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

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/background_color"
     android:orientation="vertical"
     tools:context=".ui.resource_management.guide_resource.GuideResourceActivity">
 

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

@@ -164,16 +164,10 @@
         android:layout_margin="@dimen/common_padding_huge"
         android:orientation="horizontal">
 
-        <TextView
+        <com.pan_american.android.util.CommitButton
             android:id="@+id/commit"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/button_height"
-            android:layout_marginBottom="50dp"
-            android:background="@drawable/shape_corner_solid_blue"
-            android:gravity="center"
-            android:text="@string/confirm"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_large"
-            android:textStyle="bold" />
+            android:layout_height="@dimen/button_height"/>
+
     </LinearLayout>
 </LinearLayout>

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

@@ -353,7 +353,7 @@
     <string name="add_guide_resource">新增导游地接资源</string>
     <string name="guide_resource_detail">导游地接资源详情</string>
 
-    <string name="guide_resource_name">导游地接</string>
+    <string name="guide_resource_name_type">导游地接类型</string>
     <string name="service_evaluation">服务评分</string>
     <string name="guide_score">导游评分</string>
 
@@ -371,6 +371,9 @@
     <string name="add_new_guide_payment_info">新增导游地接费用信息</string>
     <string name="per_price">单价</string>
 
+    <string name="guide_type_select_hint">请选择导游地接类型</string>
+    <string name="department_location_input_hint">请输入单位地区</string>
+
     <!-- 导游地接资料，错误信息 -->
     <string name="guide_resource_list_get_failed">导游地接列表获取失败</string>