Parcourir la source

2024-04-26 修改

修改:

1. 机票费用详情:设置已审核费用不能修改

2. 市场客户资料,当列表为空时弹出提示 暂无数据
zhaiy il y a 11 mois
Parent
commit
9e7c6a3164

+ 11 - 2
app/src/main/java/com/pan_american/android/ui/group_airplane_ticket/airplane_payment_insert/AddAirplaneTicketActivity.kt

@@ -41,6 +41,10 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
 
     private var paymentId = 0
 
+    //2024-04-26 机票费用 设置已审核费用不能修改
+
+    private var isAuditGM = -1
+
     private val apiService = ServiceCreator.create<APIService>()
 
     private var berthList = ArrayList<Selector>()
@@ -101,6 +105,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
             fromList = getBooleanExtra("fromList", false)
             groupId = getIntExtra("groupId", 0)
             paymentId = getIntExtra("paymentId", 0)
+            isAuditGM = getIntExtra("isAuditGM", -1)
             binding.groupName.text = getStringExtra("teamName")
             binding.groupNumber.text = getStringExtra("tourCode")
             binding.groupCustomer.text = getStringExtra("clientName")
@@ -135,7 +140,9 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
 
             binding.commit.text = resources.getString(R.string.update)
 
-            if (!OASystem.authorization(OASystem.AIRPLANE_PAYMENT_INSERT, OASystem.EDIT)) {
+            //2024-04-26 机票费用 设置已审核费用不能修改
+
+            if (!OASystem.authorization(OASystem.AIRPLANE_PAYMENT_INSERT, OASystem.EDIT) || isAuditGM == 1) {
                 binding.apply {
                     berthType.isEnabled = false
                     unitPrice.isEnabled = false
@@ -760,7 +767,9 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
 
         binding.commit.setOnClickListener {
 
-            if (!OASystem.authorization(OASystem.AIRPLANE_PAYMENT_INSERT, OASystem.EDIT)) {
+            //2024-04-26 机票费用 设置已审核费用不能修改
+
+            if (!OASystem.authorization(OASystem.AIRPLANE_PAYMENT_INSERT, OASystem.EDIT) || isAuditGM == 1) {
                 back()
                 return@setOnClickListener
             }

+ 3 - 0
app/src/main/java/com/pan_american/android/ui/group_airplane_ticket/airplane_payment_insert/AirplaneTicketListFragment.kt

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

+ 9 - 0
app/src/main/java/com/pan_american/android/ui/resource_management/market_customer/MarketCustomerActivity.kt

@@ -316,11 +316,20 @@ class MarketCustomerActivity : BaseActivity<ActivityMarketCustomerBinding>() {
                         response: Response<MarketCustomerResponse>
                     ) {
                         val marketCustomerResponse = response.body()
+
                         if (marketCustomerResponse != null) {
                             if (marketCustomerResponse.code == 200) {
                                 for (item in marketCustomerResponse.data.pageSource) {
                                     marketCustomerListItemList.add(item)
                                 }
+
+                                //2024-04-26 市场客户资料,当列表为空时弹出提示 暂无数据
+
+                                if (marketCustomerListItemList.size == 0) {
+                                    showMessage(resources.getString(R.string.no_data))
+                                    return
+                                }
+
                                 when (type) {
                                     1 -> {
                                         totalPage = marketCustomerResponse.data.totalPage