refactor(更新):

- 统一弹窗逻辑，移除倒计时和取消按钮的默认显示
- 用户管理模块新增和编辑用户弹窗中密码输入框默认不显示密码
- 用户管理编辑用户时，密码为非必填
- 修复用户删除后依然可以登录问题
- App启动时增加异常作业检查，若异常已处理则结束作业
- 优化作业中用户判断逻辑，排除已产生异常的作业
- 优化异常处理逻辑，异常处理选择结束作业时，直接结束作业

app/src/main/java/com/grkj/iscs/features/main/activity/MainActivity.kt

@@ -142,6 +142,7 @@ class MainActivity() : BaseActivity<ActivityMainBinding>() {
                 binding.navBar.selectedItemId = firstId
                 MainDomainData.fromQuickEntry = false
                 viewModel.checkMyTodoForHandleKey().observe(this) {}
+                viewModel.checkExceptionJob()
             }
             binding.navBar.isVisible = bottomNavDestinations.contains(destination.id)
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/DataExportFragment.kt

@@ -86,8 +86,6 @@ class DataExportFragment : BaseFragment<FragmentDataExportBinding>() {
                                 showToast(CommonUtils.getStr("save_success"))
                             }
                         }
-                    }, onCancelClick = {
-                        it.delete()
                     })
             } else {
                 TipDialog.showError(CommonUtils.getStr("data_export_error"))

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/PointMangeFragment.kt

@@ -80,13 +80,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                                 title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 msg = CommonUtils.getStr("add_point_succeed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getPointData(nextPage = false)
-                                },
-                                onCancelClick = {
-                                    getPointData(nextPage = false)
                                 }
                             )
                         } else {
@@ -94,13 +90,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                                 title = CommonUtils.getStr("action_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
                                 msg = CommonUtils.getStr("add_point_failed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getPointData(nextPage = false)
-                                },
-                                onCancelClick = {
-                                    getPointData(nextPage = false)
                                 }
                             )
                         }
@@ -211,13 +203,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                             title = CommonUtils.getStr("action_succeed"),
                             dialogType = TipDialog.DialogType.SUCCESS,
                             msg = CommonUtils.getStr("update_point_succeed"),
-                            countDownTime = 10,
                             showCancel = false,
                             onConfirmClick = {
                                 getPointData(nextPage = false)
-                            },
-                            onCancelClick = {
-                                getPointData(nextPage = false)
                             }
                         )
                     } else {
@@ -225,13 +213,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                             title = CommonUtils.getStr("action_failed"),
                             dialogType = TipDialog.DialogType.ERROR,
                             msg = CommonUtils.getStr("update_point_failed"),
-                            countDownTime = 10,
                             showCancel = false,
                             onConfirmClick = {
                                 getPointData(nextPage = false)
-                            },
-                            onCancelClick = {
-                                getPointData(nextPage = false)
                             }
                         )
                     }
@@ -291,16 +275,14 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                         TipDialog.show(
                             dialogType = TipDialog.DialogType.SUCCESS,
                             msg = CommonUtils.getStr("point_manage_delete_succeed"),
-                            showCancel = false,
-                            countDownTime = 10
+                            showCancel = false
                         )
                         getPointData(false)
                     } else {
                         TipDialog.show(
                             dialogType = TipDialog.DialogType.ERROR,
                             msg = CommonUtils.getStr("point_manage_delete_failed"),
-                            showCancel = false,
-                            countDownTime = 10
+                            showCancel = false
                         )
                     }
                 }

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/RoleManageFragment.kt

@@ -54,13 +54,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                         title = CommonUtils.getStr("action_failed"),
                         dialogType = TipDialog.DialogType.ERROR,
                         msg = CommonUtils.getStr("role_key_already_exists"),
-                        countDownTime = 10,
                         showCancel = false,
                         onConfirmClick = {
                             getRoleData(nextPage = false)
-                        },
-                        onCancelClick = {
-                            getRoleData(nextPage = false)
                         }
                     )
                     return@show
@@ -73,13 +69,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                 title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 msg = CommonUtils.getStr("add_role_succeed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getRoleData(nextPage = false)
-                                },
-                                onCancelClick = {
-                                    getRoleData(nextPage = false)
                                 }
                             )
                         } else {
@@ -87,13 +79,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                 title = CommonUtils.getStr("action_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
                                 msg = CommonUtils.getStr("add_role_failed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getRoleData(nextPage = false)
-                                },
-                                onCancelClick = {
-                                    getRoleData(nextPage = false)
                                 }
                             )
                         }
@@ -178,13 +166,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                 dialogType = TipDialog.DialogType.ERROR,
                                 msg = CommonUtils.getStr("role_key_already_exists")
                                     .toString(),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getRoleData(nextPage = false)
-                                },
-                                onCancelClick = {
-                                    getRoleData(nextPage = false)
                                 }
                             )
                             return@show
@@ -196,13 +180,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                     title = CommonUtils.getStr("action_succeed"),
                                     dialogType = TipDialog.DialogType.SUCCESS,
                                     msg = CommonUtils.getStr("update_role_succeed"),
-                                    countDownTime = 10,
                                     showCancel = false,
                                     onConfirmClick = {
                                         getRoleData(nextPage = false)
-                                    },
-                                    onCancelClick = {
-                                        getRoleData(nextPage = false)
                                     }
                                 )
                             } else {
@@ -210,14 +190,10 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                     title = CommonUtils.getStr("action_failed"),
                                     dialogType = TipDialog.DialogType.ERROR,
                                     msg = CommonUtils.getStr("update_role_failed"),
-                                    countDownTime = 10,
                                     showCancel = false,
                                     onConfirmClick = {
                                         getRoleData(nextPage = false)
                                     },
-                                    onCancelClick = {
-                                        getRoleData(nextPage = false)
-                                    }
                                 )
                             }
                         }
@@ -279,8 +255,7 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                 TipDialog.show(
                                     dialogType = TipDialog.DialogType.SUCCESS,
                                     msg = CommonUtils.getStr("role_manage_delete_succeed"),
-                                    showCancel = false,
-                                    countDownTime = 10
+                                    showCancel = false
                                 )
                                 getRoleData(false)
                             } else {
@@ -288,7 +263,6 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                     dialogType = TipDialog.DialogType.ERROR,
                                     msg = CommonUtils.getStr("role_manage_delete_failed"),
                                     showCancel = false,
-                                    countDownTime = 10
                                 )
                             }
                         }

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/UserManageFragment.kt

@@ -87,13 +87,9 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                                     title = CommonUtils.getStr("action_succeed"),
                                     dialogType = TipDialog.DialogType.SUCCESS,
                                     msg = CommonUtils.getStr("add_user_succeed"),
-                                    countDownTime = 10,
                                     showCancel = false,
                                     onConfirmClick = {
                                         getUserData(false)
-                                    },
-                                    onCancelClick = {
-                                        getUserData(false)
                                     }
                                 )
                             }
@@ -189,13 +185,9 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                                 title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 msg = CommonUtils.getStr("update_user_succeed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getUserData(false)
-                                },
-                                onCancelClick = {
-                                    getUserData(false)
                                 }
                             )
                         } else {
@@ -203,13 +195,9 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                                 title = CommonUtils.getStr("action_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
                                 msg = CommonUtils.getStr("update_user_failed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getUserData(false)
-                                },
-                                onCancelClick = {
-                                    getUserData(false)
                                 }
                             )
                         }
@@ -266,7 +254,6 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                                     dialogType = TipDialog.DialogType.SUCCESS,
                                     msg = CommonUtils.getStr("user_manage_delete_succeed"),
                                     showCancel = false,
-                                    countDownTime = 10
                                 )
                                 getUserData(false)
                             } else {
@@ -274,7 +261,6 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                                     dialogType = TipDialog.DialogType.ERROR,
                                     msg = CommonUtils.getStr("user_manage_delete_failed"),
                                     showCancel = false,
-                                    countDownTime = 10
                                 )
                             }
                         }

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/WorkstationManageFragment.kt

@@ -66,27 +66,19 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                                 title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 msg = CommonUtils.getStr("update_workstation_succeed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getWorkstationManageData()
                                 },
-                                onCancelClick = {
-                                    getWorkstationManageData()
-                                }
                             )
                         } else {
                             TipDialog.show(
                                 title = CommonUtils.getStr("action_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
                                 msg = CommonUtils.getStr("update_workstation_failed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getWorkstationManageData()
-                                },
-                                onCancelClick = {
-                                    getWorkstationManageData()
                                 }
                             )
                         }
@@ -107,28 +99,20 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                                 title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 msg = CommonUtils.getStr("add_workstation_succeed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getWorkstationManageData()
                                 },
-                                onCancelClick = {
-                                    getWorkstationManageData()
-                                }
                             )
                         } else {
                             TipDialog.show(
                                 title = CommonUtils.getStr("action_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
                                 msg = CommonUtils.getStr("add_workstation_failed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getWorkstationManageData()
                                 },
-                                onCancelClick = {
-                                    getWorkstationManageData()
-                                }
                             )
                         }
                     }
@@ -244,7 +228,6 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                                 args = listOf(deleteItem.workstationName).toTypedArray()
                             ),
                             showCancel = false,
-                            countDownTime = 10
                         )
                         getWorkstationManageData()
                     } else {
@@ -255,7 +238,6 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                                 args = listOf(deleteItem.workstationName).toTypedArray()
                             ),
                             showCancel = false,
-                            countDownTime = 10
                         )
                     }
                 }

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionDetailFragment.kt

@@ -52,10 +52,6 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
                             onConfirmClick = {
                                 binding.handleException.isVisible = false
                                 binding.cancelException.isVisible = false
-                            },
-                            onCancelClick = {
-                                binding.handleException.isVisible = false
-                                binding.cancelException.isVisible = false
                             })
                     } else {
                         TipDialog.showError(CommonUtils.getStr("cancel_exception_failed"))
@@ -99,8 +95,7 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
     private fun showHandleSuccessDialog() {
         TipDialog.showSuccess(
             CommonUtils.getStr("handle_exception_success"),
-            onConfirmClick = ::hideHandleButtons,
-            onCancelClick = ::hideHandleButtons
+            onConfirmClick = ::hideHandleButtons
         )
     }
 
@@ -187,9 +182,6 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
                                         CommonUtils.getStr("handle_exception_success"),
                                         onConfirmClick = {
                                             navController.popBackStack()
-                                        },
-                                        onCancelClick = {
-                                            navController.popBackStack()
                                         })
                                 } else {
                                     TipDialog.showError(it.second)
@@ -213,9 +205,6 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
                                                         CommonUtils.getStr("handle_exception_success"),
                                                         onConfirmClick = {
                                                             navController.popBackStack()
-                                                        },
-                                                        onCancelClick = {
-                                                            navController.popBackStack()
                                                         })
                                                 } else {
                                                     TipDialog.showError(CommonUtils.getStr("create_job_failed"))
@@ -226,9 +215,6 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
                                                 CommonUtils.getStr("handle_exception_success"),
                                                 onConfirmClick = {
                                                     navController.popBackStack()
-                                                },
-                                                onCancelClick = {
-                                                    navController.popBackStack()
                                                 })
                                         })
                                 } else {
@@ -253,9 +239,6 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
                                                         CommonUtils.getStr("handle_exception_success"),
                                                         onConfirmClick = {
                                                             navController.popBackStack()
-                                                        },
-                                                        onCancelClick = {
-                                                            navController.popBackStack()
                                                         })
                                                 } else {
                                                     TipDialog.showError(CommonUtils.getStr("create_job_failed"))
@@ -266,9 +249,6 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
                                                 CommonUtils.getStr("handle_exception_success"),
                                                 onConfirmClick = {
                                                     navController.popBackStack()
-                                                },
-                                                onCancelClick = {
-                                                    navController.popBackStack()
                                                 })
                                         })
                                 } else {

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionJobFragment.kt

@@ -76,9 +76,6 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                             CommonUtils.getStr("cancel_exception_success"),
                             onConfirmClick = {
                                 navController.popBackStack()
-                            },
-                            onCancelClick = {
-                                navController.popBackStack()
                             })
                     } else {
                         TipDialog.showError(CommonUtils.getStr("cancel_exception_failed"))
@@ -176,9 +173,6 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                                         CommonUtils.getStr("handle_exception_success"),
                                         onConfirmClick = {
                                             navController.popBackStack()
-                                        },
-                                        onCancelClick = {
-                                            navController.popBackStack()
                                         })
                                 } else {
                                     TipDialog.showError(it.second)
@@ -202,9 +196,6 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                                                         CommonUtils.getStr("handle_exception_success"),
                                                         onConfirmClick = {
                                                             navController.popBackStack()
-                                                        },
-                                                        onCancelClick = {
-                                                            navController.popBackStack()
                                                         })
                                                 } else {
                                                     TipDialog.showError(CommonUtils.getStr("create_job_failed"))
@@ -215,9 +206,6 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                                                 CommonUtils.getStr("handle_exception_success"),
                                                 onConfirmClick = {
                                                     navController.popBackStack()
-                                                },
-                                                onCancelClick = {
-                                                    navController.popBackStack()
                                                 })
                                         })
                                 } else {
@@ -242,9 +230,6 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                                                         CommonUtils.getStr("handle_exception_success"),
                                                         onConfirmClick = {
                                                             navController.popBackStack()
-                                                        },
-                                                        onCancelClick = {
-                                                            navController.popBackStack()
                                                         })
                                                 } else {
                                                     TipDialog.showError(CommonUtils.getStr("create_job_failed"))
@@ -255,9 +240,6 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                                                 CommonUtils.getStr("handle_exception_success"),
                                                 onConfirmClick = {
                                                     navController.popBackStack()
-                                                },
-                                                onCancelClick = {
-                                                    navController.popBackStack()
                                                 })
                                         })
                                 } else {
@@ -410,9 +392,6 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                     msg = CommonUtils.getStr("ticket_lost"),
                     onConfirmClick = {
                         navController.popBackStack()
-                    },
-                    onCancelClick = {
-                        navController.popBackStack()
                     })
             }
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionReportFragment.kt

@@ -56,10 +56,6 @@ class ExceptionReportFragment : BaseFormFragment<FragmentExceptionReportBinding>
                         onConfirmClick = {
                             clearData()
                             resetFormDirty()
-                        },
-                        onCancelClick = {
-                            clearData()
-                            resetFormDirty()
                         })
                 }
             }

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/CardManageFragment.kt

@@ -50,12 +50,10 @@ class CardManageFragment : BaseFragment<FragmentCardManageBinding>() {
                             title = CommonUtils.getStr(titleRes).toString(),
                             dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
                             msg = CommonUtils.getStr(msgRes).toString(),
-                            countDownTime = 10,
                             showCancel = false,
                             onConfirmClick = {
                                 loadCards(reset = true)
                             },
-                            onCancelClick = { loadCards(reset = true) }
                         )
                     }
                 }
@@ -121,10 +119,8 @@ class CardManageFragment : BaseFragment<FragmentCardManageBinding>() {
                         title = CommonUtils.getStr(titleRes).toString(),
                         dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
                         msg = CommonUtils.getStr(msgRes).toString(),
-                        countDownTime = 10,
                         showCancel = false,
                         onConfirmClick = { loadCards(reset = true) },
-                        onCancelClick = { loadCards(reset = true) }
                     )
                 }
             }
@@ -177,7 +173,6 @@ class CardManageFragment : BaseFragment<FragmentCardManageBinding>() {
                         msg = CommonUtils.getStr(if (ok) "card_manage_delete_succeed" else "card_manage_delete_failed")
                             .toString(),
                         showCancel = false,
-                        countDownTime = 10
                     )
                     loadCards(reset = true)
                 }

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/KeyManageFragment.kt

@@ -54,14 +54,10 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                                 title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 msg = CommonUtils.getStr("add_key_succeed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getKeyData(false)
                                 },
-                                onCancelClick = {
-                                    getKeyData(false)
-                                }
                             )
                         } else {
                             TipDialog.show(
@@ -69,14 +65,10 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                                     .toString(),
                                 dialogType = TipDialog.DialogType.ERROR,
                                 msg = CommonUtils.getStr("add_key_failed"),
-                                countDownTime = 10,
                                 showCancel = false,
                                 onConfirmClick = {
                                     getKeyData(false)
                                 },
-                                onCancelClick = {
-                                    getKeyData(false)
-                                }
                             )
                         }
                     }
@@ -140,14 +132,10 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                             title = CommonUtils.getStr("action_succeed"),
                             dialogType = TipDialog.DialogType.SUCCESS,
                             msg = CommonUtils.getStr("update_key_succeed"),
-                            countDownTime = 10,
                             showCancel = false,
                             onConfirmClick = {
                                 getKeyData(false)
                             },
-                            onCancelClick = {
-                                getKeyData(false)
-                            }
                         )
                     } else {
                         TipDialog.show(
@@ -155,14 +143,10 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                                 .toString(),
                             dialogType = TipDialog.DialogType.ERROR,
                             msg = CommonUtils.getStr("update_key_failed").toString(),
-                            countDownTime = 10,
                             showCancel = false,
                             onConfirmClick = {
                                 getKeyData(false)
                             },
-                            onCancelClick = {
-                                getKeyData(false)
-                            }
                         )
                     }
                 }
@@ -217,7 +201,6 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                                     dialogType = TipDialog.DialogType.SUCCESS,
                                     msg = CommonUtils.getStr("key_manage_delete_succeed"),
                                     showCancel = false,
-                                    countDownTime = 10
                                 )
                                 getKeyData(false)
                             } else {
@@ -225,7 +208,6 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                                     dialogType = TipDialog.DialogType.ERROR,
                                     msg = CommonUtils.getStr("key_manage_delete_failed"),
                                     showCancel = false,
-                                    countDownTime = 10
                                 )
                             }
                         }

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/LockManageFragment.kt

@@ -51,12 +51,10 @@ class LockManageFragment : BaseFragment<FragmentLockManageBinding>() {
                             title = CommonUtils.getStr(titleRes),
                             dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
                             msg = CommonUtils.getStr(msgRes),
-                            countDownTime = 10,
                             showCancel = false,
                             onConfirmClick = {
                                 loadLocks(true)
-                            },
-                            onCancelClick = { loadLocks(reset = true) }
+                            }
                         )
                     }
                 }
@@ -124,12 +122,10 @@ class LockManageFragment : BaseFragment<FragmentLockManageBinding>() {
                             title = CommonUtils.getStr(titleRes),
                             dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
                             msg = CommonUtils.getStr(msgRes),
-                            countDownTime = 10,
                             showCancel = false,
                             onConfirmClick = {
                                 loadLocks(true)
                             },
-                            onCancelClick = { loadLocks(reset = true) }
                         )
                     }
                 }
@@ -178,7 +174,7 @@ class LockManageFragment : BaseFragment<FragmentLockManageBinding>() {
                                 dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
                                 msg = CommonUtils.getStr(if (ok) "lock_manage_delete_succeed" else "lock_manage_delete_failed")
                                     .toString(),
-                                showCancel = false, countDownTime = 10
+                                showCancel = false
                             )
                             loadLocks(reset = true)
                         }

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/RfidTokenManageFragment.kt

@@ -48,13 +48,9 @@ class RfidTokenManageFragment : BaseFragment<FragmentRfidTokenManageBinding>() {
                             title = CommonUtils.getStr(titleRes),
                             dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
                             msg = CommonUtils.getStr(msgRes),
-                            countDownTime = 10,
                             showCancel = false,
                             onConfirmClick = {
                                 loadTokens(true)
-                            },
-                            onCancelClick = {
-                                loadTokens(reset = true)
                             }
                         )
                     }
@@ -127,12 +123,10 @@ class RfidTokenManageFragment : BaseFragment<FragmentRfidTokenManageBinding>() {
                         title = CommonUtils.getStr(titleRes),
                         dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
                         msg = CommonUtils.getStr(msgRes),
-                        countDownTime = 10,
                         showCancel = false,
                         onConfirmClick = {
                             loadTokens(true)
                         },
-                        onCancelClick = { loadTokens(reset = true) }
                     )
                 }
             }
@@ -186,7 +180,6 @@ class RfidTokenManageFragment : BaseFragment<FragmentRfidTokenManageBinding>() {
                         msg = CommonUtils.getStr(if (ok) "rfid_token_manage_delete_succeed" else "rfid_token_manage_delete_failed")
                             .toString(),
                         showCancel = false,
-                        countDownTime = 10
                     )
                     loadTokens(reset = true)
                 }

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/SlotsManageFragment.kt

@@ -105,9 +105,6 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                         msg = CommonUtils.getStr("exception_report_success"),
                         onConfirmClick = {
                             binding.dockRv.adapter?.notifyDataSetChanged()
-                        },
-                        onCancelClick = {
-                            binding.dockRv.adapter?.notifyDataSetChanged()
                         })
                 }
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/CreateJobFragment.kt

@@ -408,20 +408,15 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
                                 title = CommonUtils.getStr("action_succeed"),
                                 msg = CommonUtils.getStr("job_create_and_execute_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
-                                countDownTime = 10,
                                 onConfirmClick = {
                                     navController.popBackStack()
-                                },
-                                onCancelClick = {
-                                    navController.popBackStack()
-                                })
+                                },)
                         } else {
                             TipDialog.show(
                                 title = CommonUtils.getStr("action_failed"),
                                 msg = CommonUtils.getStr("job_create_and_execute_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
                                 showCancel = false,
-                                countDownTime = 10
                             )
                         }
                     }
@@ -430,12 +425,8 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
                         title = CommonUtils.getStr("action_succeed"),
                         msg = CommonUtils.getStr("job_create_succeed"),
                         dialogType = TipDialog.DialogType.SUCCESS,
-                        countDownTime = 10,
                         onConfirmClick = {
                             navController.popBackStack()
-                        },
-                        onCancelClick = {
-                            navController.popBackStack()
                         })
                 }
             } else {
@@ -443,8 +434,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
                     title = CommonUtils.getStr("action_failed"),
                     msg = CommonUtils.getStr("job_create_failed"),
                     dialogType = TipDialog.DialogType.ERROR,
-                    showCancel = false,
-                    countDownTime = 10
+                    showCancel = false
                 )
             }
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/CreateSopFragment.kt

@@ -350,14 +350,9 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
                     title = CommonUtils.getStr("action_succeed").toString(),
                     msg = CommonUtils.getStr("sop_create_succeed").toString(),
                     dialogType = TipDialog.DialogType.SUCCESS,
-                    countDownTime = 10,
                     onConfirmClick = {
                         clearData()
                         setDefaultData()
-                    },
-                    onCancelClick = {
-                        clearData()
-                        setDefaultData()
                     })
             } else {
                 TipDialog.show(
@@ -365,7 +360,6 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
                     msg = CommonUtils.getStr("sop_create_failed").toString(),
                     dialogType = TipDialog.DialogType.ERROR,
                     showCancel = false,
-                    countDownTime = 10
                 )
             }
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/CreateSopJobFragment.kt

@@ -269,12 +269,8 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
                                 msg = CommonUtils.getStr("sop_job_save_and_execute_succeed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.SUCCESS,
-                                countDownTime = 10,
                                 onConfirmClick = {
                                     navController.popBackStack()
-                                },
-                                onCancelClick = {
-                                    navController.popBackStack()
                                 }
                             )
                         } else {
@@ -284,7 +280,6 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
                                 msg = CommonUtils.getStr("sop_job_save_and_execute_failed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.SUCCESS,
-                                countDownTime = 10,
                             )
                         }
                     }
@@ -294,12 +289,8 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
                             .toString(),
                         msg = CommonUtils.getStr("sop_job_save_succeed").toString(),
                         dialogType = TipDialog.DialogType.SUCCESS,
-                        countDownTime = 10,
                         onConfirmClick = {
                             navController.popBackStack()
-                        },
-                        onCancelClick = {
-                            navController.popBackStack()
                         }
                     )
                 }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/EditJobFragment.kt

@@ -280,13 +280,9 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
                                 msg = CommonUtils.getStr("job_create_and_execute_succeed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.SUCCESS,
-                                countDownTime = 10,
                                 onConfirmClick = {
                                     navController.popBackStack()
-                                },
-                                onCancelClick = {
-                                    navController.popBackStack()
-                                })
+                                },)
                         } else {
                             TipDialog.show(
                                 title = CommonUtils.getStr("action_failed")
@@ -295,7 +291,6 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
                                     .toString(),
                                 dialogType = TipDialog.DialogType.ERROR,
                                 showCancel = false,
-                                countDownTime = 10
                             )
                         }
                     }
@@ -305,13 +300,9 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
                             .toString(),
                         msg = CommonUtils.getStr("job_create_succeed").toString(),
                         dialogType = TipDialog.DialogType.SUCCESS,
-                        countDownTime = 10,
                         onConfirmClick = {
                             navController.popBackStack()
-                        },
-                        onCancelClick = {
-                            navController.popBackStack()
-                        })
+                        },)
                 }
             } else {
                 TipDialog.show(
@@ -319,7 +310,6 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
                     msg = CommonUtils.getStr("job_create_failed").toString(),
                     dialogType = TipDialog.DialogType.ERROR,
                     showCancel = false,
-                    countDownTime = 10
                 )
             }
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/EditSopFragment.kt

@@ -270,12 +270,8 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
                     title = CommonUtils.getStr("action_succeed").toString(),
                     msg = CommonUtils.getStr("sop_save_succeed").toString(),
                     dialogType = TipDialog.DialogType.SUCCESS,
-                    countDownTime = 10,
                     onConfirmClick = {
                         navController.popBackStack()
-                    },
-                    onCancelClick = {
-                        navController.popBackStack()
                     }
                 )
             } else {
@@ -284,7 +280,6 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
                     msg = CommonUtils.getStr("sop_save_failed").toString(),
                     dialogType = TipDialog.DialogType.ERROR,
                     showCancel = false,
-                    countDownTime = 10
                 )
             }
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/EditSopJobFragment.kt

@@ -268,12 +268,8 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
                                 msg = CommonUtils.getStr("sop_job_save_and_execute_succeed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.SUCCESS,
-                                countDownTime = 10,
                                 onConfirmClick = {
                                     navController.popBackStack()
-                                },
-                                onCancelClick = {
-                                    navController.popBackStack()
                                 }
                             )
                         } else {
@@ -282,8 +278,7 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
                                     .toString(),
                                 msg = CommonUtils.getStr("sop_job_save_and_execute_failed")
                                     .toString(),
-                                dialogType = TipDialog.DialogType.SUCCESS,
-                                countDownTime = 10,
+                                dialogType = TipDialog.DialogType.SUCCESS
                             )
                         }
                     }
@@ -293,12 +288,8 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
                             .toString(),
                         msg = CommonUtils.getStr("sop_job_save_succeed").toString(),
                         dialogType = TipDialog.DialogType.SUCCESS,
-                        countDownTime = 10,
                         onConfirmClick = {
                             navController.popBackStack()
-                        },
-                        onCancelClick = {
-                            navController.popBackStack()
                         }
                     )
                 }
@@ -308,7 +299,6 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
                     msg = CommonUtils.getStr("sop_job_save_failed").toString(),
                     dialogType = TipDialog.DialogType.ERROR,
                     showCancel = false,
-                    countDownTime = 10
                 )
             }
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobExecuteFragment.kt

@@ -655,9 +655,6 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                     msg = CommonUtils.getStr("ticket_lost").toString(),
                     onConfirmClick = {
                         navController.popBackStack()
-                    },
-                    onCancelClick = {
-                        navController.popBackStack()
                     })
             }
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobManageFragment.kt

@@ -88,12 +88,8 @@ class JobManageFragment : BaseFragment<FragmentJobManageBinding>() {
                             msg = CommonUtils.getStr("job_manage_delete_succeed")
                                 .toString(),
                             showCancel = false,
-                            countDownTime = 10,
                             onConfirmClick = {
                                 getData(false)
-                            },
-                            onCancelClick = {
-                                getData(false)
                             }
                         )
                     } else {
@@ -102,7 +98,6 @@ class JobManageFragment : BaseFragment<FragmentJobManageBinding>() {
                             msg = CommonUtils.getStr("job_manage_delete_failed")
                                 .toString(),
                             showCancel = false,
-                            countDownTime = 10
                         )
                     }
                 }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/SopManageFragment.kt

@@ -83,12 +83,8 @@ class SopManageFragment : BaseFragment<FragmentSopManageBinding>() {
                                     msg = CommonUtils.getStr("sop_manage_delete_succeed")
                                         .toString(),
                                     showCancel = false,
-                                    countDownTime = 10,
                                     onConfirmClick = {
                                         getSopData(false)
-                                    },
-                                    onCancelClick = {
-                                        getSopData(false)
                                     }
                                 )
                             } else {
@@ -97,7 +93,6 @@ class SopManageFragment : BaseFragment<FragmentSopManageBinding>() {
                                     msg = CommonUtils.getStr("sop_manage_delete_failed")
                                         .toString(),
                                     showCancel = false,
-                                    countDownTime = 10
                                 )
                             }
                         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/WorkflowManageFragment.kt

@@ -77,12 +77,8 @@ class WorkflowManageFragment : BaseFragment<FragmentWorkflowManageBinding>() {
                             msg = CommonUtils.getStr("workflow_mode_manage_delete_succeed")
                                 .toString(),
                             showCancel = false,
-                            countDownTime = 10,
                             onConfirmClick = {
                                 getData()
-                            },
-                            onCancelClick = {
-                                getData()
                             }
                         )
                     } else {
@@ -90,8 +86,7 @@ class WorkflowManageFragment : BaseFragment<FragmentWorkflowManageBinding>() {
                             dialogType = TipDialog.DialogType.ERROR,
                             msg = CommonUtils.getStr("job_manage_delete_failed")
                                 .toString(),
-                            showCancel = false,
-                            countDownTime = 10
+                            showCancel = false
                         )
                     }
                 }

app/src/main/java/com/grkj/iscs/features/main/fragment/user_info/ResetPasswordFragment.kt

@@ -44,8 +44,6 @@ class ResetPasswordFragment : BaseFragment<FragmentResetPasswordBinding>() {
                             CommonUtils.getStr("reset_user_password_succeed").toString(),
                             onConfirmClick = {
                                 LogoutEvent.sendLogoutEvent()
-                            }, onCancelClick = {
-                                LogoutEvent.sendLogoutEvent()
                             })
                     } else {
                         TipDialog.showError(

app/src/main/java/com/grkj/iscs/features/main/fragment/user_info/SetJobCardFragment.kt

@@ -53,11 +53,9 @@ class SetJobCardFragment : BaseFragment<FragmentSetJobCardBinding>() {
                     .observe(this@SetJobCardFragment) {
                         TipDialog.show(
                             msg = CommonUtils.getStr("save_success"),
+                            showCancel = false,
                             onConfirmClick = {
                                 getData()
-                            },
-                            onCancelClick = {
-                                getData()
                             })
                     }
             }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/MainViewModel.kt

@@ -71,6 +71,13 @@ class MainViewModel @Inject constructor(
         }
     }
 
+    /**
+     * 检查异常作业
+     */
+    fun checkExceptionJob(){
+        jobTicketRepository.checkExceptionJob()
+    }
+
     /**
      * 移除蓝牙监听
      */

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/JobExecuteViewModel.kt

@@ -273,12 +273,8 @@ class JobExecuteViewModel @Inject constructor(
                         CommonUtils.getStr("action_failed").toString(),
                         CommonUtils.getStr("lock_is_not_enough").toString(),
                         TipDialog.DialogType.ERROR,
-                        countDownTime = 10,
                         onConfirmClick = {
                             LoadingEvent.sendLoadingEvent()
-                        },
-                        onCancelClick = {
-                            LoadingEvent.sendLoadingEvent()
                         })
                     return@checkEquipCount
                 }
@@ -287,12 +283,8 @@ class JobExecuteViewModel @Inject constructor(
                         CommonUtils.getStr("action_failed").toString(),
                         CommonUtils.getStr("no_available_key").toString(),
                         TipDialog.DialogType.ERROR,
-                        countDownTime = 10,
                         onConfirmClick = {
                             LoadingEvent.sendLoadingEvent()
-                        },
-                        onCancelClick = {
-                            LoadingEvent.sendLoadingEvent()
                         })
                     return@checkEquipCount
                 } else {
@@ -404,7 +396,7 @@ class JobExecuteViewModel @Inject constructor(
                                 CommonUtils.getStr("no_available_key")
                                     .toString(),
                                 TipDialog.DialogType.ERROR,
-                                countDownTime = 10
+                                showCancel = false
                             )
                             return@checkEquipCount
                         }

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

@@ -125,6 +125,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_2"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
+                android:inputType="textPassword"
                 android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:formRole="field"

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

@@ -111,7 +111,7 @@
                 app:formRole="label"
                 app:i18nKey='@{"password"}'
                 app:markPosition="start"
-                app:required="true" />
+                app:required="false" />
 
             <EditText
                 android:id="@+id/password_et"
@@ -120,6 +120,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_2"
                 android:background="@drawable/bg_common_input"
                 android:maxLines="1"
+                android:inputType="textPassword"
                 android:paddingHorizontal="@dimen/iscs_space_2"
                 android:paddingVertical="2dp"
                 android:singleLine="true"

data/src/main/java/com/grkj/data/dao/ExceptionDao.kt

@@ -72,4 +72,14 @@ interface ExceptionDao {
      */
     @Query("select * from is_exception_source_standard where exception_id = :exceptionId")
     fun getExceptionSourceDataByExceptionId(exceptionId: Long): List<IsExceptionSourceStandard>
+
+    /**
+     * 查询异常是否处理
+     */
+    @Query("""
+        select ies.exception_status from is_exception_standard ies 
+        left join is_exception_source_standard iess on iess.exception_id = ies.exception_id 
+        where iess.source_data_id = :ticketId
+    """)
+    fun getJobExceptionStatus(ticketId: Long): Int
 }

data/src/main/java/com/grkj/data/dao/JobTicketDao.kt

@@ -825,7 +825,7 @@ interface JobTicketDao {
     /**
      * 检查用户是否在作业中
      */
-    @Query("select count(1) from is_job_ticket ijt left join is_job_ticket_user ijtu on ijt.ticket_id = ijtu.ticket_id left join sys_user su on ijt.create_by = su.user_name where (su.user_id in (:userIds) or ijtu.user_id in (:userIds)) and ijt.ticket_status in ('1','2','3','4','7') and ijt.del_flag = 0")
+    @Query("select count(1) from is_job_ticket ijt left join is_job_ticket_user ijtu on ijt.ticket_id = ijtu.ticket_id left join sys_user su on ijt.create_by = su.user_name where (su.user_id in (:userIds) or ijtu.user_id in (:userIds)) and ijt.ticket_status in ('1','2','3','4','7') and ijt.del_flag = 0 and ijt.ex_status is null")
     fun checkUserInProgressJob(userIds: List<Long>): Int
 
     /**
@@ -857,4 +857,10 @@ interface JobTicketDao {
      */
     @Query("select * from is_job_ticket where del_flag = 0")
     fun getAllJob(): List<IsJobTicket>
+
+    /**
+     * 获取所有异常作业
+     */
+    @Query("select * from is_job_ticket where ex_status is not null and del_flag = 0 and ticket_status != 5")
+    fun selectExceptionJob(): List<IsJobTicket>
 }

data/src/main/java/com/grkj/data/dao/UserDao.kt

@@ -29,7 +29,7 @@ interface UserDao {
     /**
      * 根据userid查询用户信息
      */
-    @Query("select * from sys_user where user_id = :userId")
+    @Query("select * from sys_user where user_id = :userId and del_flag = 0")
     fun getUserInfoByUserId(userId: Long): SysUserDo?
 
     /**

data/src/main/java/com/grkj/data/logic/IJobTicketLogic.kt

@@ -362,4 +362,9 @@ interface IJobTicketLogic {
      * 获取所有作业数据
      */
     fun getAllJobData(): List<DataExportJobVo>
+
+    /**
+     * 检查异常作业
+     */
+    fun checkExceptionJob()
 }

data/src/main/java/com/grkj/data/logic/impl/network/NetworkJobTicketLogic.kt

@@ -291,6 +291,10 @@ class NetworkJobTicketLogic @Inject constructor() : BaseLogic(), IJobTicketLogic
         TODO("Not yet implemented")
     }
 
+    override fun checkExceptionJob() {
+        TODO("Not yet implemented")
+    }
+
     override fun checkSopHasJobInProgress(sopId: Long): Boolean {
         TODO("Not yet implemented")
     }

data/src/main/java/com/grkj/data/logic/impl/standard/ExceptionLogic.kt

@@ -155,17 +155,11 @@ class ExceptionLogic @Inject constructor(
                                 }?.dictValue
                             }"
                         )
-                        if (exceptionDataItem.processApplication == CommonDictDataEnum.EXCEPTION_PROCESS_APPLICATION_JOB.commonDictRes.find {
-                                I18nManager.t(it.dictLabel).contains(
-                                    "结束作业"
-                                )
-                            }?.dictValue) {
-                            jobTicketSteps.forEach {
-                                it.stepStatus = "1"
-                                jobTicketDao.updateTicketStepData(it)
-                            }
-                            jobTicketData?.ticketStatus = JobTicketStatusEnum.FINISHED.status
+                        jobTicketSteps.forEach {
+                            it.stepStatus = "1"
+                            jobTicketDao.updateTicketStepData(it)
                         }
+                        jobTicketData?.ticketStatus = JobTicketStatusEnum.FINISHED.status
                         jobTicketData?.let {
                             jobTicketDao.updateTicketData(it)
                         }

data/src/main/java/com/grkj/data/logic/impl/standard/JobTicketLogic.kt

@@ -3,7 +3,6 @@ package com.grkj.data.logic.impl.standard
 import com.grkj.data.check_data.ICheckDataMode
 import com.grkj.data.dao.ExceptionDao
 import com.grkj.data.dao.HardwareDao
-import com.grkj.data.dao.IsSopDao
 import com.grkj.data.dao.IsolationPointDao
 import com.grkj.data.dao.JobTicketDao
 import com.grkj.data.dao.WorkflowStepDao
@@ -278,6 +277,21 @@ class JobTicketLogic @Inject constructor(
         return jobTicketDao.checkUserInProgressJob(userIds) > 0
     }
 
+    override fun checkExceptionJob() {
+        val exceptionJob = jobTicketDao.selectExceptionJob()
+        for (ticket in exceptionJob) {
+            val exceptionStatus = exceptionDao.getJobExceptionStatus(ticket.ticketId)
+            if (exceptionStatus == CommonDictDataEnum.EXCEPTION_STATUS.commonDictRes.find {
+                    I18nManager.t(
+                        it.dictLabel
+                    ) == I18nManager.t("processed")
+                }?.dictValue?.toInt()) {
+                ticket.ticketStatus = JobTicketStatusEnum.FINISHED.status
+                updateTicketData(ticket)
+            }
+        }
+    }
+
     override fun checkOnlyLockJob(selectedTicketId: List<Long>): Boolean {
         val ticketSteps = jobTicketDao.getStepsByTicketIds(selectedTicketId)
         return ticketSteps.groupBy { it.ticketId }
@@ -794,8 +808,7 @@ class JobTicketLogic @Inject constructor(
                 I18nManager.t(it.dictLabel) == I18nManager.t(
                     "abnormal"
                 )
-            }
-                .mapNotNull { it.dictValue }.ifEmpty { listOf("") }  // 管理员也能传，但不会被用到
+            }.mapNotNull { it.dictValue }.ifEmpty { listOf("") }  // 管理员也能传，但不会被用到
 
         return jobTicketDao.getTicketDataPage(
             size = size, offset = current * size, isAdmin = isAdmin, exStatusList = exStatusList

ui-base/src/main/java/com/grkj/ui_base/base/BaseFormFragment.kt

@@ -142,7 +142,7 @@ abstract class BaseFormFragment<V : ViewDataBinding> : BaseFragment<V>() {
             title = CommonUtils.getStr("action_hint").toString(),
             msg = CommonUtils.getStr("not_save_tip").toString(),
             dialogType = TipDialog.DialogType.ERROR,
-            countDownTime = 10,
+            showCancel = false,
             onConfirmClick = onConfirm
         )
     }

ui-base/src/main/java/com/grkj/ui_base/dialog/TipDialog.kt

@@ -192,9 +192,9 @@ class TipDialog : OnBindView<CustomDialog>(R.layout.dialog_tip) {
         @JvmStatic
         fun showSuccess(
             msg: String,
-            showCancel: Boolean = true,
+            showCancel: Boolean = false,
             showConfirm: Boolean = true,
-            countDownTime: Int = 10,
+            countDownTime: Int = -1,
             onConfirmClick: () -> Unit = {},
             onCancelClick: () -> Unit = {}
         ) {
@@ -218,9 +218,9 @@ class TipDialog : OnBindView<CustomDialog>(R.layout.dialog_tip) {
         @JvmStatic
         fun showError(
             msg: String,
-            showCancel: Boolean = true,
+            showCancel: Boolean = false,
             showConfirm: Boolean = true,
-            countDownTime: Int = 10,
+            countDownTime: Int = -1,
             onConfirmClick: () -> Unit = {},
             onCancelClick: () -> Unit = {}
         ) {