Merge branch 'master' of http://git.xinwangdao.com/china-resources-surgical/admin

src/views/system/user/index.vue

@@ -74,7 +74,7 @@
   };
 
   const [registerDrawer, { openDrawer }] = useDrawer();
-  const [registerTable, { reload }] = useTable({
+  const [registerTable, { reload, setLoading }] = useTable({
     title: '用户表',
     api: (params) => UserApi.search(handleParams(params)),
     columns,
@@ -135,9 +135,14 @@
   };
 
   const handleDelete = (record: Recordable) => {
-    UserApi.remove(record.id).then((_) => {
-      reload();
-    });
+    setLoading(true);
+    UserApi.remove(record.id)
+      .then((_) => {
+        reload();
+      })
+      .catch(() => {
+        setLoading(false);
+      });
   };
 
   const handleCheck = (record: any, status: string) => {
@@ -147,11 +152,17 @@
     });
   };
 
-  const handleBatchDelete = () => {
-    UserApi.batchRemove(checkedKeys.value).then((_) => {
-      reload();
-    });
-  };
+  // 批量删除暂时不要
+  // const handleBatchDelete = () => {
+  //   setLoading(true);
+  //   UserApi.batchRemove(checkedKeys.value)
+  //     .then((_) => {
+  //       reload();
+  //     })
+  //     .catch(() => {
+  //       setLoading(false);
+  //     });
+  // };
 
   const handleSuccess = () => {
     reload();