diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ebea092..972eff9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,7 @@ + @@ -91,4 +92,14 @@ android:resource="@xml/file_paths" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ebea092..972eff9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,7 @@ + @@ -91,4 +92,14 @@ android:resource="@xml/file_paths" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index b1df400..85f4c58 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -146,7 +146,7 @@ viewHolder.setOnClickListener(R.id.showDetailButton) { requireContext().navigatePageTo( - addAll(item.approvalStatus, item.id) + addAll(item.approvalStatusName, item.id) ) } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ebea092..972eff9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,7 @@ + @@ -91,4 +92,14 @@ android:resource="@xml/file_paths" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index b1df400..85f4c58 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -146,7 +146,7 @@ viewHolder.setOnClickListener(R.id.showDetailButton) { requireContext().navigatePageTo( - addAll(item.approvalStatus, item.id) + addAll(item.approvalStatusName, item.id) ) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index e30c7c3..d14c729 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -19,14 +19,6 @@ import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_certificate_detail.* -//"草稿箱" -> "1" -//"待审批" -> "2" -//"审批中" -> "3" -//"已通过" -> "4" -//"未通过" -> "5" -//"已取消" -> "6" -//"可打印" -> "9" - class CertificateReportDetailActivity : KotlinBaseActivity() { private var fragmentPages: ArrayList = ArrayList() @@ -37,13 +29,16 @@ val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! when (args[0]) { - "1" -> { + "草稿箱" -> { approvalView.text = "提交" } - "2" -> { + "待审批" -> { approvalView.text = "审批" } - "9" -> { + "审批中" -> { + approvalView.text = "审批" + } + "可打印" -> { approvalView.text = "打印" } else -> { @@ -84,7 +79,11 @@ leftBackView.setOnClickListener { finish() } approvalView.setOnClickListener { - certificateViewModel.submit(detailModel.id) + if (approvalView.text == "提交") { + certificateViewModel.submit(detailModel.id) + } else if (approvalView.text == "审批") { + + } } }