Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

frontend/src/views/demo/proTable/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class='table-box'>
     <ProTable
-      ref='proTable'
-      :columns='columns'
-      :data='userData'
+        ref='proTable'
+        :columns='columns'
+        :data='userData'
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader='scope'>
@@ -17,7 +17,7 @@
       </template>
       <!-- 表格操作 -->
       <template #operation='scope'>
-        <el-button v-if='scope.row.status === 1' type='primary' link :icon='View'
+        <el-button type='primary' link :icon='View'
                    @click="openDrawer('查看', scope.row)">查看
         </el-button>
         <el-button type='primary' link :icon='EditPen' @click="openDrawer('编辑', scope.row)">编辑</el-button>
@@ -80,8 +80,9 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
   { type: 'index', fixed: 'left', width: 70, label: '序号' },
   {
     prop: 'username',
-    label: '用户姓名',
-    search: { el: 'input', tooltip: '我是搜索提示' },
+    label: '姓名',
+    width: 120,
+    search: { el: 'input'},
   },
   {
     prop: 'gender',
@@ -98,39 +99,39 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
       // 自定义 search 显示内容
       render: ({ searchParam }) => {
         return (
-          <div class='flx-center'>
-            <el-input vModel_trim={searchParam.minAge} placeholder='最小年龄' />
-            <span class='mr10 ml10'>-</span>
-            <el-input vModel_trim={searchParam.maxAge} placeholder='最大年龄' />
-          </div>
+            <div class='flx-center'>
+              <el-input vModel_trim={searchParam.minAge} placeholder='最小年龄' />
+              <span class='mr10 ml10'>-</span>
+              <el-input vModel_trim={searchParam.maxAge} placeholder='最大年龄' />
+            </div>
         )
       },
     },
   },
   { prop: 'idCard', label: '身份证号', search: { el: 'input' } },
   { prop: 'email', label: '邮箱' },
-  { prop: 'address', label: '居住地址' },
+  { prop: 'address', label: '居住地址', width: 120 },
   {
     prop: 'status',
-    label: '用户状态',
+    label: '状态',
     enum: dictStore.getDictData('status'),
     search: { el: 'tree-select', props: { filterable: true } },
     fieldNames: { label: 'userLabel', value: 'userStatus' },
     render: scope => {
       return (
-        <>
-          {BUTTONS.value.status ? (
-            <el-switch
-              model-value={scope.row.status}
-              active-text={scope.row.status ? '启用' : '禁用'}
-              active-value={1}
-              inactive-value={0}
-              onClick={() => changeStatus(scope.row)}
-            />
-          ) : (
-            <el-tag type={scope.row.status ? 'success' : 'danger'}>{scope.row.status ? '启用' : '禁用'}</el-tag>
-          )}
-        </>
+          <>
+            {BUTTONS.value.status ? (
+                <el-switch
+                    model-value={scope.row.status}
+                    active-text={scope.row.status ? '启用' : '禁用'}
+                    active-value={1}
+                    inactive-value={0}
+                    onClick={() => changeStatus(scope.row)}
+                />
+            ) : (
+                <el-tag type={scope.row.status ? 'success' : 'danger'}>{scope.row.status ? '启用' : '禁用'}</el-tag>
+            )}
+          </>
       )
     },
   },
@@ -141,7 +142,7 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
     search: {
       el: 'date-picker',
       span: 1,
-      props: { type: 'daterange', valueFormat: 'YYYY-MM-DD'},
+      props: { type: 'daterange', valueFormat: 'YYYY-MM-DD' },
       defaultValue: ['2024-11-12', '2024-12-12'],
     },
   },
@@ -174,7 +175,7 @@ const changeStatus = async (row: User.ResUserList) => {
 // 导出用户列表
 const downloadFile = async () => {
   ElMessageBox.confirm('确认导出用户数据?', '温馨提示', { type: 'warning' }).then(() =>
-    useDownload(exportUserInfo, '用户列表', proTable.value?.searchParam),
+      useDownload(exportUserInfo, '用户列表', proTable.value?.searchParam),
   )
 }
 // 批量添加用户