From ffa6c9a5d968543109c7284fd17364f0aea2808f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Thu, 11 Jul 2024 16:37:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/Table.vue |  3 ++-
 src/views/data/param/columns.ts    | 12 ++++++++++--
 src/views/system/user/edit.vue     | 17 +++++++++--------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index 58fd48e..aef61ed 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -85,11 +85,12 @@
       <el-table ref="tableElRef" v-bind="getBindValues" v-loading="getLoading" @selection-change="handleSelectionChange">
         <template v-for="item in getTableColumns" :key="item.prop">
           <el-table-column
+           align="center"
             v-if="item.type === 'index' || item.type === 'selection'"
             :type="item.type"
             :width="item.width"
           />
-          <el-table-column v-else :prop="item.prop" v-bind="item" show-overflow-tooltip>
+          <el-table-column v-else :prop="item.prop" v-bind="item" show-overflow-tooltip align="center">
             <template #default="scope" v-if="item.render">
               <Render :column="item" :row="scope.row" :render="item.render" :index="scope.$index" />
             </template>
diff --git a/src/views/data/param/columns.ts b/src/views/data/param/columns.ts
index 3385421..765a326 100644
--- a/src/views/data/param/columns.ts
+++ b/src/views/data/param/columns.ts
@@ -6,11 +6,19 @@ export const columns = [
     type: 'selection',
   },
   {
-    label: '职级名称',
+    label: '参数名称',
     prop: 'name',
   },
   {
-    label: '职级状态',
+    label: '参数编码',
+    prop: 'code',
+  },
+  {
+    label: '参数值',
+    prop: 'value',
+  },
+  {
+    label: '参数状态',
     prop: 'status',
     render(record) {
       return h(
diff --git a/src/views/system/user/edit.vue b/src/views/system/user/edit.vue
index 932f261..5d62948 100644
--- a/src/views/system/user/edit.vue
+++ b/src/views/system/user/edit.vue
@@ -34,7 +34,8 @@
             <el-option v-for="(item, index) in optionData.roleList" :key="index" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="部门" prop="deptId" class="flex-1">
+        <el-form-item label="部门" prop="deptId" class="flex-1"
+        :rules="{ required: true, message: '请选择部门', trigger: 'change' }">
           <el-tree-select
             v-model="formData.deptId"
             :data="optionData.deptList"
@@ -44,12 +45,12 @@
         </el-form-item>
       </div>
       <div class="flex">
-        <el-form-item label="职级" prop="levelId" class="flex-1">
+        <el-form-item label="职级" prop="levelId" class="flex-1" :rules="{ required: true, message: '请选择职级', trigger: 'change' }">
           <el-select v-model="formData.levelId" class="flex-1" clearable placeholder="请选择职级">
             <el-option v-for="(item, index) in optionData.levelList" :key="index" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="岗位" prop="positionId" class="flex-1">
+        <el-form-item label="岗位" prop="positionId" class="flex-1" :rules="{ required: true, message: '请选择岗位', trigger: 'change' }">
           <el-select v-model="formData.positionId" class="flex-1" clearable placeholder="请选择岗位">
             <el-option v-for="(item, index) in optionData.positionList" :key="index" :label="item.name" :value="item.id" />
           </el-select>
@@ -61,16 +62,16 @@
           <el-input v-model="formData.mobile" placeholder="请输入手机号码" clearable />
         </el-form-item>
         <el-form-item label="邮箱地址" prop="email" class="flex-1"
-          :rules="{ type: 'email', message: '请输入正确邮箱地址', trigger: 'blur'}">
+          :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确邮箱地址', trigger: 'blur'}]">
           <el-input v-model="formData.email" placeholder="请输入邮箱地址" clearable />
         </el-form-item>
       </div>
 
       <div class="flex">
-        <el-form-item label="所属区域" class="flex-1">
+        <el-form-item label="所属区域" class="flex-1" prop="city" :rules="{ required: true, message: '请选择所属区域', trigger: 'change' }">
           <chinaArea style="width: 100%" :type="4" v-model="formData.city"></chinaArea>
         </el-form-item>
-        <el-form-item label="详细地址" class="flex-1">
+        <el-form-item label="详细地址" class="flex-1" prop="address" :rules="{ required: true, message: '请输入详细地址', trigger: 'blur' }">
           <el-input v-model="formData.address" placeholder="请输入详细地址" clearable />
         </el-form-item>
       </div>
@@ -81,7 +82,7 @@
             <el-radio :value="2">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="排序" prop="sort" class="flex-1">
+        <el-form-item label="排序" prop="sort" class="flex-1" :rules="{ required: true, message: '请输入排序', trigger: 'blur' }">
           <el-input-number v-model="formData.sort" :max="9999" />
         </el-form-item>
       </div>
@@ -95,7 +96,7 @@
           <el-input v-model="formData.note" type="textarea" placeholder="请输入备注" clearable />
         </el-form-item>
       </div>
-      <el-form-item label="头像" prop="images">
+      <el-form-item label="头像" prop="avatar" :rules="{ required: true, message: '请输上传头像', trigger: 'blur' }">
         <BasicUpload :action="`${uploadUrl}/api/upload/uploadFile`" :list="formData.avatar?[{name:formData.avatarName,url:formData.avatar}]:[]" :headers="uploadHeaders"
           :data="{ name: 'user' }" :limit="1" @upload-change="uploadChange" @delete="handleDelete"/>
       </el-form-item>