From e2da9442acbe63787c7f21fe382101ef26ee4e3f Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 21 Oct 2024 14:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/userInfo.js          |  9 +++----
 src/views/system/userInfo/index.vue | 37 +++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/api/system/userInfo.js b/src/api/system/userInfo.js
index 7cde7dd..8b18393 100644
--- a/src/api/system/userInfo.js
+++ b/src/api/system/userInfo.js
@@ -55,11 +55,12 @@ export function delUser(data) {
   })
 }
 // 导出用户
-export function exportUser(data) {
+export function exportUser(query) {
   return request({
     url: '/system/user/export',
-    method: 'post',
-    data: data
+    method: 'get',
+    responseType: 'blob',
+    params: query
   })
 }
 //模板下载
@@ -86,4 +87,4 @@ export function getPersonSelect(query) {
     method: 'get',
     params: query
   })
-}
\ No newline at end of file
+}
diff --git a/src/views/system/userInfo/index.vue b/src/views/system/userInfo/index.vue
index 01e10b8..264f7ff 100644
--- a/src/views/system/userInfo/index.vue
+++ b/src/views/system/userInfo/index.vue
@@ -18,7 +18,7 @@
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-  
+
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']"
@@ -34,7 +34,7 @@
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
-  
+
       <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
@@ -45,6 +45,7 @@
         <el-table-column label="所属部门" align="center" prop="orgName" :show-overflow-tooltip="true" />
         <el-table-column label="岗位" align="center" prop="postName" :show-overflow-tooltip="true"/>
         <el-table-column label="人员角色" align="center" prop="roleName" :show-overflow-tooltip="true" />
+        <el-table-column label="身份证号" align="center" prop="idNumber" :show-overflow-tooltip="true" />
         <el-table-column label="手机号(登录名称)" align="center" prop="phone" :show-overflow-tooltip="true" />
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
@@ -69,7 +70,7 @@
           </template>
         </el-table-column>
       </el-table>
-  
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -77,7 +78,7 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
-       
+
       <!-- 添加或修改参数配置对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -123,8 +124,15 @@
                         <el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11"/>
                     </el-form-item>
                 </el-col>
-                
+
+              <el-col :span="12">
+                <el-form-item label="身份证号" prop="idNumber">
+                  <el-input v-model="form.idNumber" placeholder="请输入身份证号码" maxlength="18"/>
+                </el-form-item>
+              </el-col>
+
             </el-row>
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -158,13 +166,14 @@
 
     </div>
   </template>
-  
+
   <script>
   import { listUser, getUserById, delUser, addUser, updateUser, getSelectRole, exportUser,resetPwd,userTempFile } from "@/api/system/userInfo";
   import { listDept } from "@/api/system/dept";
   import { getToken } from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";   
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import {downloadFile} from "@/utils/download";
   export default {
     name: "Dict",
     dicts: ['post_list'],
@@ -222,6 +231,14 @@
               trigger: "blur"
             }
           ],
+          idNumber: [
+            { required: true, message: "身份证号码不能为空", trigger: "blur" },
+            {
+              pattern: /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}[\dXx]$/,
+              message: "身份证号码格式不正确",
+              trigger: "blur"
+            }
+          ],
         },
         // 用户导入参数
         upload: {
@@ -376,8 +393,8 @@
       },
       /** 导出按钮操作 */
       handleExport() {
-        exportUser().then(res => {
-          this.downloadFile({ fileName: `用户_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+        exportUser(this.queryParams).then(res => {
+          downloadFile({ fileName: `用户_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
         })
       },
       /** 导入按钮操作 */
@@ -407,4 +424,4 @@
       }
     }
   };
-  </script>
\ No newline at end of file
+  </script>