Merge remote-tracking branch 'origin/dev' into dev

src/views/inspectionWork/patrolTask.vue

@@ -210,19 +210,19 @@ const handleUpdate = (row) => {
     patrolTaskEditState.show = true;
   }
 };
-const handleDelete = async (row) => {
+const handleDelete = (row) => {
   let id = [];
   if (row) {
     id = [row.id];
   } else {
     id = ids.value;
   }
-  const [err] = await to(proxy?.$modal.confirm('是否确认删除选择的数据项？') as any);
-  if (!err) {
-    await workDelete(id);
-    proxy.$modal.msgSuccess('删除成功');
-    fetchWorkrData();
-  }
+  proxy?.$modal.confirm('是否确认删除选择的数据项？').then(() => {
+    workDelete(id).then(() => {
+      proxy.$modal.msgSuccess('删除成功');
+      fetchWorkrData();
+    });
+  })
 };
 
 const fetchWorkrData = () => {