|
@@ -46,8 +46,6 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
|
|
|
|
|
|
private var insuranceTypeId = 0
|
|
|
|
|
|
- private var insuranceTypeSelected = false
|
|
|
-
|
|
|
private var customerList = ArrayList<Selector>()
|
|
|
|
|
|
private var customerSelectList = ArrayList<Selector>()
|
|
@@ -146,7 +144,6 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
|
|
|
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
|
|
@@ -154,6 +151,15 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
|
|
|
paymentWayId = item.id
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //2024-04-26 保险费用录入费用类型默认为不选此项
|
|
|
+ for (item in insuranceType) {
|
|
|
+ if (item.id == 2) {
|
|
|
+ binding.insuranceType.text = item.gName
|
|
|
+
|
|
|
+ insuranceTypeId = item.id
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -177,7 +183,6 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
|
|
|
insuranceType[position].apply {
|
|
|
insuranceTypeId = id
|
|
|
binding.insuranceType.text = gName
|
|
|
- insuranceTypeSelected = true
|
|
|
}
|
|
|
|
|
|
popupWindow.dismiss()
|
|
@@ -421,13 +426,6 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
|
|
|
updateInsurancePaymentRequest.id = paymentId
|
|
|
updateInsurancePaymentRequest.diId = groupId
|
|
|
|
|
|
- if (!insuranceTypeSelected) {
|
|
|
- showMessage(resources.getString(R.string.insurance_type_select_hint))
|
|
|
- return@setOnClickListener
|
|
|
- } else {
|
|
|
- updateInsurancePaymentRequest.iid = insuranceTypeId
|
|
|
- }
|
|
|
-
|
|
|
if (customerSelectList.size == 0) {
|
|
|
showMessage(resources.getString(R.string.customer_select_hint))
|
|
|
return@setOnClickListener
|
|
@@ -773,8 +771,6 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
|
|
|
|
|
|
binding.insuranceType.text = item.gName
|
|
|
|
|
|
- insuranceTypeSelected = true
|
|
|
-
|
|
|
return@run
|
|
|
}
|
|
|
}
|