2024-09-26 新增 / 修改

新增：
1. 财务模块 日付申请 费用审核

修改：
1. 部分IU修改，界面逻辑修改

app/src/main/java/com/pan_american/android/data/model/daily_payment/adapter/DailyPaymentListAdapter.kt

@@ -0,0 +1,189 @@
+package com.pan_american.android.data.model.daily_payment.adapter
+
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.pan_american.android.OASystem
+import com.pan_american.android.R
+import com.pan_american.android.data.model.daily_payment.entity.DailyPaymentCardListItem
+
+class DailyPaymentListAdapter(private var itemList: ArrayList<DailyPaymentCardListItem>): RecyclerView.Adapter<DailyPaymentListAdapter.ViewHolder>() {
+
+    lateinit var onItemClick: OnItemClick
+
+    inner class ViewHolder(view: View): RecyclerView.ViewHolder(view) {
+        val paymentName: TextView = view.findViewById(R.id.payment_name)
+        val deleteButton: ImageView = view.findViewById(R.id.delete)
+        val paymentRevert: TextView = view.findViewById(R.id.payment_revert)
+        val paymentCreator: TextView = view.findViewById(R.id.payment_creator)
+        val totalPayment: TextView = view.findViewById(R.id.total_payment)
+        val createTime: TextView = view.findViewById(R.id.create_time)
+        val financeStatus: TextView = view.findViewById(R.id.finance_status)
+        val financeIcon: ImageView = view.findViewById(R.id.finance_icon)
+        val financeReviewer: TextView = view.findViewById(R.id.finance_reviewer)
+        val generalStatus: TextView = view.findViewById(R.id.general_status)
+        val generalIcon: ImageView = view.findViewById(R.id.general_icon)
+        val generalReviewer: TextView = view.findViewById(R.id.general_reviewer)
+        val isPay: TextView = view.findViewById(R.id.is_pay)
+        val isPayIcon: ImageView = view.findViewById(R.id.is_pay_icon)
+        val dailyPaymentApproval: LinearLayout = view.findViewById(R.id.daily_payment_approval)
+        val disapproval: TextView = view.findViewById(R.id.disapproval)
+        val approval: TextView = view.findViewById(R.id.approval)
+        val passed: TextView = view.findViewById(R.id.verified)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = LayoutInflater.from(OASystem.context).inflate(R.layout.item_daily_payment, parent, false)
+        val viewHolder = ViewHolder(view)
+
+        viewHolder.apply {
+            itemView.setOnClickListener {
+                onItemClick.onItemClick(absoluteAdapterPosition)
+            }
+
+            deleteButton.setOnClickListener {
+                onItemClick.onItemDelete(absoluteAdapterPosition)
+            }
+
+            disapproval.setOnClickListener {
+                onItemClick.onDisapprovalClick(absoluteAdapterPosition)
+            }
+
+            approval.setOnClickListener {
+                onItemClick.onApprovalClick(absoluteAdapterPosition)
+            }
+        }
+
+        return viewHolder
+    }
+
+    override fun getItemCount() = itemList.size
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.apply {
+            itemList[position].also {
+                paymentName.text = it.instructions
+                paymentRevert.text = it.companyName
+                paymentCreator.text = it.createUser
+                totalPayment.text = String.format(OASystem.context.resources.getString(R.string.rmb_price), it.sumPrice)
+                createTime.text = it.createTime
+                financeStatus.text = it.fAuditDesc
+                generalStatus.text = it.mAuditDesc
+                financeReviewer.text = it.fAuditName
+                generalReviewer.text = it.mAuditName
+
+                when (it.fAudit) {
+                    0 -> {
+                        financeIcon.setImageResource(R.mipmap.icon_wait)
+                        financeStatus.setTextColor(Color.rgb(23, 171, 227))
+                    }
+
+                    1 -> {
+                        financeIcon.setImageResource(R.mipmap.icon_passed)
+                        financeStatus.setTextColor(Color.rgb(84, 213, 77))
+                    }
+
+                    2 -> {
+                        financeIcon.setImageResource(R.mipmap.icon_reject)
+                        financeStatus.setTextColor(Color.rgb(210, 45, 34))
+                    }
+                }
+
+                when (it.mAudit) {
+                    0 -> {
+                        generalIcon.setImageResource(R.mipmap.icon_wait)
+                        generalStatus.setTextColor(Color.rgb(23, 171, 227))
+                    }
+
+                    1 -> {
+                        generalIcon.setImageResource(R.mipmap.icon_passed)
+                        generalStatus.setTextColor(Color.rgb(84, 213, 77))
+                    }
+
+                    2 -> {
+                        generalIcon.setImageResource(R.mipmap.icon_reject)
+                        generalStatus.setTextColor(Color.rgb(210, 45, 34))
+                    }
+                }
+
+                when (it.isPay) {
+                    0 -> {
+                        isPay.apply {
+                            text = resources.getString(R.string.not_pay)
+                            setTextColor(Color.rgb(23, 171, 227))
+                        }
+                        isPayIcon.setImageResource(R.mipmap.icon_wait)
+                    }
+
+                    1 -> {
+                        isPay.apply {
+                            text = resources.getString(R.string.paid)
+                            setTextColor(Color.rgb(84, 213, 77))
+                        }
+                        isPayIcon.setImageResource(R.mipmap.icon_passed)
+                    }
+                }
+
+                when (OASystem.userInfo.userId) {
+
+                    21 -> {
+                        when (it.mAudit) {
+                            0 -> {
+                                dailyPaymentApproval.visibility = View.VISIBLE
+                                passed.visibility = View.GONE
+                            }
+
+                            1 -> {
+                                dailyPaymentApproval.visibility = View.GONE
+                                passed.visibility = View.VISIBLE
+                                passed.text = OASystem.context.resources.getString(R.string.verify_passed)
+                            }
+
+                            2 -> {
+                                dailyPaymentApproval.visibility = View.GONE
+                                passed.visibility = View.VISIBLE
+                                passed.text = OASystem.context.resources.getString(R.string.verify_rejected)
+                            }
+                        }
+                    }
+
+                    22 -> {
+                        when (it.fAudit) {
+                            0 -> {
+                                dailyPaymentApproval.visibility = View.VISIBLE
+                                passed.visibility = View.GONE
+                            }
+
+                            1 -> {
+                                dailyPaymentApproval.visibility = View.GONE
+                                passed.visibility = View.VISIBLE
+                                passed.text = OASystem.context.resources.getString(R.string.verify_passed)
+                            }
+
+                            2 -> {
+                                dailyPaymentApproval.visibility = View.GONE
+                                passed.visibility = View.VISIBLE
+                                passed.text = OASystem.context.resources.getString(R.string.verify_rejected)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    interface OnItemClick {
+        fun onItemClick (position: Int)
+
+        fun onItemDelete(position: Int)
+
+        fun onDisapprovalClick(position: Int)
+
+        fun onApprovalClick(position: Int)
+    }
+}

app/src/main/java/com/pan_american/android/data/model/daily_payment/network/DailyPaymentApprovalRequest.kt

@@ -0,0 +1,7 @@
+package com.pan_american.android.data.model.daily_payment.network
+
+class DailyPaymentApprovalRequest {
+    var id = 0
+    var auditType = 0
+    var auditStatus = 0
+}

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

@@ -87,7 +87,7 @@ class GroundConveyListAdapter(private val groundConveyList: ArrayList<GroundConv
 
                 2 -> {
                     holder.isVerify.apply {
-                        text = resources.getString(R.string.verify_reject)
+                        text = resources.getString(R.string.verify_rejected)
                         setTextColor(Color.rgb(210, 45, 34))
                     }
                 }

app/src/main/java/com/pan_american/android/data/network/APIService.kt

@@ -53,6 +53,7 @@ import com.pan_american.android.data.model.customer_resource.related_invitee.net
 import com.pan_american.android.data.model.customer_resource.related_invitee.network.RelatedInviteeListRequest
 import com.pan_american.android.data.model.customer_resource.related_invitee.network.RelatedInviteeListResponse
 import com.pan_american.android.data.model.daily_payment.network.AddDailyPaymentRequest
+import com.pan_american.android.data.model.daily_payment.network.DailyPaymentApprovalRequest
 import com.pan_american.android.data.model.daily_payment.network.DailyPaymentDetailRequest
 import com.pan_american.android.data.model.daily_payment.network.DailyPaymentDetailResponse
 import com.pan_american.android.data.model.daily_payment.network.DailyPaymentListRequest
@@ -460,6 +461,12 @@ interface APIService {
     @POST("/api/Financial/PostDelDailyPayment")
     fun deleteDailyPayment(@Body deleteRequest: DeleteRequest): Call<BaseResponse>
 
+    /**
+     * 日付申请，日付审核
+     */
+    @POST("api/Financial/PostDelDailyPaymentAudit")
+    fun dailyPaymentApproval(@Body dailyPaymentApprovalRequest: DailyPaymentApprovalRequest): Call<BaseResponse>
+
     /**
      * 通用 获取团组简单信息
      */

app/src/main/java/com/pan_american/android/ui/efficiency_tools/daily_payment/DailyPaymentListActivity.kt

@@ -1,10 +1,8 @@
 package com.pan_american.android.ui.efficiency_tools.daily_payment
 
 import android.content.Intent
-import android.graphics.Color
 import android.os.Bundle
 import android.view.View
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -13,12 +11,13 @@ import com.pan_american.android.R
 import com.pan_american.android.base.BaseActivity
 import com.pan_american.android.base.BaseRequest
 import com.pan_american.android.base.BaseResponse
-import com.pan_american.android.base.CardAdapter
 import com.pan_american.android.base.CustomAlertDialog
 import com.pan_american.android.base.ListAdapter
 import com.pan_american.android.data.model.common.entity.Selector
 import com.pan_american.android.data.model.common.network.DeleteRequest
+import com.pan_american.android.data.model.daily_payment.adapter.DailyPaymentListAdapter
 import com.pan_american.android.data.model.daily_payment.entity.DailyPaymentCardListItem
+import com.pan_american.android.data.model.daily_payment.network.DailyPaymentApprovalRequest
 import com.pan_american.android.data.model.daily_payment.network.DailyPaymentListRequest
 import com.pan_american.android.data.model.daily_payment.network.DailyPaymentListResponse
 import com.pan_american.android.data.model.daily_payment.network.DailyPaymentSiftResponse
@@ -499,94 +498,12 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
         val layoutManager = LinearLayoutManager(OASystem.context)
         binding.dailyPaymentList.layoutManager = layoutManager
 
-        val adapter = CardAdapter.Builder<DailyPaymentCardListItem>().apply {
-            setLayoutId(R.layout.item_daily_payment)
-            setData(dailyPaymentCardListItems)
-            setCanDelete(OASystem.authorization(OASystem.DAILY_PAYMENT, OASystem.DELETE))
-            addBindView { itemView, data ->
-                itemView.findViewById<TextView>(R.id.payment_name).text = data.instructions
-                itemView.findViewById<TextView>(R.id.payment_revert).text = data.companyName
-                itemView.findViewById<TextView>(R.id.payment_creator).text = data.createUser
-                itemView.findViewById<TextView>(R.id.total_payment).text =
-                    String.format(resources.getString(R.string.rmb_price), data.sumPrice)
-                itemView.findViewById<TextView>(R.id.create_time).text = data.createTime
-                itemView.findViewById<TextView>(R.id.finance_status).text = data.fAuditDesc
-                itemView.findViewById<TextView>(R.id.general_status).text = data.mAuditDesc
-                itemView.findViewById<TextView>(R.id.finance_reviewer).text = data.fAuditName
-                itemView.findViewById<TextView>(R.id.general_reviewer).text = data.mAuditName
-
-                when (data.fAudit) {
-                    0 -> {
-                        itemView.findViewById<ImageView>(R.id.finance_icon)
-                            .setImageResource(R.mipmap.icon_wait)
-                        itemView.findViewById<TextView>(R.id.finance_status)
-                            .setTextColor(Color.rgb(23, 171, 227))
-                    }
-
-                    1 -> {
-                        itemView.findViewById<ImageView>(R.id.finance_icon)
-                            .setImageResource(R.mipmap.icon_passed)
-                        itemView.findViewById<TextView>(R.id.finance_status)
-                            .setTextColor(Color.rgb(84, 213, 77))
-                    }
-
-                    2 -> {
-                        itemView.findViewById<ImageView>(R.id.finance_icon)
-                            .setImageResource(R.mipmap.icon_reject)
-                        itemView.findViewById<TextView>(R.id.finance_status)
-                            .setTextColor(Color.rgb(210, 45, 34))
-                    }
-                }
-
-                when (data.mAudit) {
-                    0 -> {
-                        itemView.findViewById<ImageView>(R.id.general_icon)
-                            .setImageResource(R.mipmap.icon_wait)
-                        itemView.findViewById<TextView>(R.id.general_status)
-                            .setTextColor(Color.rgb(23, 171, 227))
-                    }
-
-                    1 -> {
-                        itemView.findViewById<ImageView>(R.id.general_icon)
-                            .setImageResource(R.mipmap.icon_passed)
-                        itemView.findViewById<TextView>(R.id.general_status)
-                            .setTextColor(Color.rgb(84, 213, 77))
-                    }
-
-                    2 -> {
-                        itemView.findViewById<ImageView>(R.id.general_icon)
-                            .setImageResource(R.mipmap.icon_reject)
-                        itemView.findViewById<TextView>(R.id.general_status)
-                            .setTextColor(Color.rgb(210, 45, 34))
-                    }
-                }
-
-                when (data.isPay) {
-                    0 -> {
-                        itemView.findViewById<TextView>(R.id.is_pay).apply {
-                            text = resources.getString(R.string.not_pay)
-                            setTextColor(Color.rgb(23, 171, 227))
-                        }
-                        itemView.findViewById<ImageView>(R.id.is_pay_icon)
-                            .setImageResource(R.mipmap.icon_wait)
-                    }
-
-                    1 -> {
-                        itemView.findViewById<TextView>(R.id.is_pay).apply {
-                            text = resources.getString(R.string.paid)
-                            setTextColor(Color.rgb(84, 213, 77))
-                        }
-                        itemView.findViewById<ImageView>(R.id.is_pay_icon)
-                            .setImageResource(R.mipmap.icon_passed)
-                    }
-                }
-            }
-        }.create()
+        val adapter = DailyPaymentListAdapter(dailyPaymentCardListItems)
 
         binding.dailyPaymentList.adapter = adapter
 
-        adapter.onRecyclerViewItemClick =
-            object : CardAdapter.OnRecyclerViewItemClick<DailyPaymentCardListItem> {
+        adapter.onItemClick =
+            object : DailyPaymentListAdapter.OnItemClick {
                 override fun onItemClick(position: Int) {
 
                     val intent =
@@ -613,6 +530,34 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
                         setCancelable(false)
                     }.show()
                 }
+
+                override fun onDisapprovalClick(position: Int) {
+                    CustomAlertDialog.Builder(OASystem.context).apply {
+                        setTitle(resources.getString(R.string.hint))
+                        setMessage(String.format(resources.getString(R.string.disapproval_hint), dailyPaymentCardListItems[position].instructions))
+                        setNegativeButtonAndListener(resources.getString(R.string.cancel)) { dialog, _ ->
+                            dialog.dismiss()
+                        }
+                        setPositiveButtonAndListener(resources.getString(R.string.confirm)) { dialog, _ ->
+                            dailyPaymentAuditOperation(position, 2)
+                            dialog.dismiss()
+                        }
+                    }.show()
+                }
+
+                override fun onApprovalClick(position: Int) {
+                    CustomAlertDialog.Builder(OASystem.context).apply {
+                        setTitle(resources.getString(R.string.hint))
+                        setMessage(String.format(resources.getString(R.string.approval_hint), dailyPaymentCardListItems[position].instructions))
+                        setNegativeButtonAndListener(resources.getString(R.string.cancel)) { dialog, _ ->
+                            dialog.dismiss()
+                        }
+                        setPositiveButtonAndListener(resources.getString(R.string.confirm)) { dialog, _ ->
+                            dailyPaymentAuditOperation(position, 1)
+                            dialog.dismiss()
+                        }
+                    }.show()
+                }
             }
 
         binding.dailyPaymentContainer.setOnRefreshLoadMoreListener(object :
@@ -674,4 +619,73 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
 
         initDailyPaymentList(1)
     }
+
+    private fun dailyPaymentAuditOperation(position: Int, operation: Int) {
+        val dailyPaymentApprovalRequest = DailyPaymentApprovalRequest().apply {
+            id = dailyPaymentCardListItems[position].id
+            when(OASystem.userInfo.userId) {
+                21 -> {
+                    auditType = 2
+                }
+
+                22 -> {
+                    auditType = 1
+                }
+            }
+            auditStatus = operation
+        }
+
+        apiService.dailyPaymentApproval(dailyPaymentApprovalRequest).enqueue(object : Callback<BaseResponse> {
+            override fun onResponse(call: Call<BaseResponse>, response: Response<BaseResponse>) {
+                val approvalResponse = response.body()
+
+                if (approvalResponse != null) {
+                    if (approvalResponse.code == 200) {
+
+                        when(dailyPaymentApprovalRequest.auditStatus) {
+                            1 -> {
+                                dailyPaymentCardListItems[position].fAudit = operation
+
+                                when(operation) {
+                                    1 -> {
+                                        dailyPaymentCardListItems[position].fAuditDesc = resources.getString(R.string.verify_passed)
+                                    }
+
+                                    2 -> {
+                                        dailyPaymentCardListItems[position].fAuditDesc = resources.getString(R.string.verify_reject)
+                                    }
+                                }
+
+                            }
+
+                            2 -> {
+                                dailyPaymentCardListItems[position].mAudit = operation
+
+                                when(operation) {
+                                    1 -> {
+                                        dailyPaymentCardListItems[position].mAuditDesc = resources.getString(R.string.verify_passed)
+                                    }
+
+                                    2 -> {
+                                        dailyPaymentCardListItems[position].mAuditDesc = resources.getString(R.string.verify_reject)
+                                    }
+                                }
+                            }
+                        }
+
+                        binding.dailyPaymentList.adapter!!.notifyItemChanged(position)
+
+                        showMessage(resources.getString(R.string.approval_success))
+
+                    } else {
+                        showMessage(approvalResponse.msg)
+                    }
+                }
+            }
+
+            override fun onFailure(call: Call<BaseResponse>, t: Throwable) {
+                showErrorInfo(R.string.approval_error)
+            }
+        })
+    }
 }

app/src/main/java/com/pan_american/android/ui/financial_module/expense_approval/ExpenseApprovalActivity.kt

@@ -7,6 +7,7 @@ import android.webkit.WebChromeClient
 import android.webkit.WebSettings
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import com.pan_american.android.OASystem
 import com.pan_american.android.R
 import com.pan_american.android.base.BaseActivity
 import com.pan_american.android.databinding.ActivityExpenseApprovalBinding
@@ -31,7 +32,7 @@ class ExpenseApprovalActivity : BaseActivity<ActivityExpenseApprovalBinding>() {
                     cacheMode = WebSettings.LOAD_NO_CACHE
                     mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
                 }
-                loadUrl("http://oa.pan-american-intl.com:4399/#/expenseMobile")
+                loadUrl("http://oa.pan-american-intl.com:4399/#/expenseMobile?uid=${OASystem.userInfo.userId}&portType=2")
             }
         }
 

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

@@ -305,7 +305,7 @@ class AirplaneTicketListFragment : BaseFragment<FragmentAirplaneTicketListBindin
 
                     2 -> {
                         itemView.findViewById<TextView>(R.id.is_verify).apply {
-                            text = resources.getString(R.string.verify_reject)
+                            text = resources.getString(R.string.verify_rejected)
                             setTextColor(Color.rgb(210, 45, 34))
                         }
                     }

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

@@ -210,7 +210,7 @@ class HotelPredetermineListFragment : BaseFragment<FragmentHotelPredetermineList
 
                     2 -> {
                         itemView.findViewById<TextView>(R.id.is_verify).apply {
-                            text = resources.getString(R.string.verify_reject)
+                            text = resources.getString(R.string.verify_rejected)
                             setTextColor(Color.rgb(210, 45, 34))
                         }
                     }

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

@@ -329,7 +329,7 @@ class GroupInvitePaymentListFragment : BaseFragment<FragmentGroupInvitePaymentLi
 
                     2 -> {
                         itemView.findViewById<TextView>(R.id.is_verify).apply {
-                            text = resources.getString(R.string.verify_reject)
+                            text = resources.getString(R.string.verify_rejected)
                             setTextColor(Color.rgb(210, 45, 34))
                         }
                     }

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

@@ -261,7 +261,7 @@ class InsuranceListFragment : BaseFragment<FragmentInsuranceListBinding>() {
 
                     2 -> {
                         itemView.findViewById<TextView>(R.id.is_verify).apply {
-                            text = resources.getString(R.string.verify_reject)
+                            text = resources.getString(R.string.verify_rejected)
                             setTextColor(Color.rgb(210, 45, 34))
                         }
                     }

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

@@ -266,7 +266,7 @@ class VisaPaymentListFragment : BaseFragment<FragmentVisaPaymentListBinding>() {
 
                     2 -> {
                         itemView.findViewById<TextView>(R.id.is_verify).apply {
-                            text = resources.getString(R.string.verify_reject)
+                            text = resources.getString(R.string.verify_rejected)
                             setTextColor(Color.rgb(210, 45, 34))
                         }
                     }

app/src/main/java/com/pan_american/android/ui/personnel_module/materials_operate/MaterialHistorySearchFragment.kt

@@ -344,7 +344,7 @@ class MaterialHistorySearchFragment : BaseFragment<FragmentMaterialHistorySearch
                     name = resources.getString(R.string.verify_passed) },
                 Selector().apply {
                     id = 2
-                    name = resources.getString(R.string.verify_reject) })
+                    name = resources.getString(R.string.verify_rejected) })
 
             showSelector {
                 val adapter = ListAdapter.Builder<Selector>().apply {

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

@@ -247,7 +247,7 @@
                         android:background="@drawable/style_selector_sift"
                         android:button="@null"
                         android:gravity="center"
-                        android:text="@string/verify_reject"
+                        android:text="@string/verify_rejected"
                         android:textColor="@color/check_text_view_select" />
 
                 </RadioGroup>
@@ -326,7 +326,7 @@
                         android:background="@drawable/style_selector_sift"
                         android:button="@null"
                         android:gravity="center"
-                        android:text="@string/verify_reject"
+                        android:text="@string/verify_rejected"
                         android:textColor="@color/check_text_view_select" />
 
                 </RadioGroup>

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

@@ -13,18 +13,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/common_padding"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
 
             <TextView
                 android:id="@+id/payment_name"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginEnd="50dp"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"
@@ -64,7 +66,7 @@
             <TextView
                 android:id="@+id/payment_revert"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
@@ -96,7 +98,7 @@
             <TextView
                 android:id="@+id/payment_creator"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
@@ -128,7 +130,7 @@
             <TextView
                 android:id="@+id/total_payment"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
@@ -160,7 +162,7 @@
             <TextView
                 android:id="@+id/create_time"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
@@ -199,7 +201,8 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="end">
+                    android:gravity="end|center_vertical"
+                    tools:ignore="UseCompoundDrawables">
 
                     <TextView
                         android:id="@+id/finance_status"
@@ -213,9 +216,9 @@
                         android:id="@+id/finance_icon"
                         android:layout_width="@dimen/common_padding_huge"
                         android:layout_height="@dimen/common_padding_huge"
-                        android:layout_gravity="center"
                         android:layout_marginStart="@dimen/common_padding_small"
                         android:layout_marginEnd="@dimen/common_padding"
+                        android:gravity="center"
                         android:src="@mipmap/icon_passed"
                         tools:ignore="ContentDescription" />
 
@@ -278,7 +281,8 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="end">
+                    android:gravity="end|center"
+                    tools:ignore="UseCompoundDrawables">
 
                     <TextView
                         android:id="@+id/general_status"
@@ -292,9 +296,9 @@
                         android:id="@+id/general_icon"
                         android:layout_width="@dimen/common_padding_huge"
                         android:layout_height="@dimen/common_padding_huge"
-                        android:layout_gravity="center"
                         android:layout_marginStart="@dimen/common_padding_small"
                         android:layout_marginEnd="@dimen/common_padding"
+                        android:gravity="center_vertical"
                         android:src="@mipmap/icon_passed"
                         tools:ignore="ContentDescription" />
 
@@ -343,21 +347,22 @@
 
             <TextView
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                android:layout_height="match_parent"
+                android:gravity="center"
                 android:text="@string/is_pay"
                 android:textSize="@dimen/text_size_medium" />
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="end">
+                android:layout_height="match_parent"
+                android:gravity="end|center"
+                tools:ignore="UseCompoundDrawables">
 
                 <TextView
                     android:id="@+id/is_pay"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/verify_passed"
+                    android:text="@string/paid"
                     android:textColor="@color/passed"
                     android:textSize="@dimen/text_size_medium" />
 
@@ -374,6 +379,56 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/daily_payment_approval"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/common_padding"
+            android:layout_marginBottom="@dimen/common_padding"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/disapproval"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/button_height"
+                android:layout_marginEnd="@dimen/common_padding_huge"
+                android:layout_weight="1"
+                android:background="@drawable/shape_corner_solid_blue"
+                android:gravity="center"
+                android:text="@string/verify_reject"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_medium"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/approval"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/button_height"
+                android:layout_weight="1"
+                android:background="@drawable/shape_corner_solid_blue"
+                android:gravity="center"
+                android:text="@string/verify_pass"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_medium"
+                android:textStyle="bold"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/verified"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/button_height"
+            android:layout_marginTop="@dimen/common_padding"
+            android:layout_marginBottom="@dimen/common_padding"
+            android:background="@drawable/shape_corner_reset_button"
+            android:gravity="center"
+            android:text="@string/verify_passed"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_medium"
+            android:textStyle="bold"
+            android:visibility="gone" />
+
     </LinearLayout>
 
 </LinearLayout>

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

@@ -256,7 +256,7 @@
     <string name="general_manager_verify">总经理审核</string>
     <string name="verify_wait">未审核</string>
     <string name="verify_passed">已通过</string>
-    <string name="verify_reject">未通过</string>
+    <string name="verify_rejected">未通过</string>
     <string name="rmb_price">%.2f RMB</string>
     <string name="is_pay">是否付款</string>
     <string name="paid">已付款</string>
@@ -271,6 +271,14 @@
     <string name="total_payment">合计金额</string>
     <string name="payment_create_time">申请时间</string>
     <string name="verify_name">审核人</string>
+    <string name="verified">已审核</string>
+    <string name="verify_pass">审核通过</string>
+    <string name="verify_reject">审核拒绝</string>
+
+    <string name="disapproval_hint">是否审核拒绝该款项? \n\n费用名称: %s</string>
+    <string name="approval_hint">是否审核通过该款项? \n\n费用名称: %s</string>
+
+    <string name="approval_success">审核成功</string>
 
     <!-- 日付申请添加 -->
     <string name="payment_identification">类型标识</string>
@@ -303,6 +311,7 @@
 
     <!-- 日付费用，错误信息 -->
     <string name="daily_payment_detail_get_failed">日付详情获取失败</string>
+    <string name="approval_error">审核失败</string>
 
     <!-- 汇率换算工具 -->
     <string name="zero">0</string>