Merge branch 'main' of http://47.97.125.165:8902/jiangs/lis8.0-vue3

src/api/system/user.js

@@ -133,3 +133,12 @@ export function deptTreeSelect() {
     method: 'get'
   })
 }
+
+
+// 从老lis系统导入
+export function importFromLis() {
+  return request({
+    url: '/system/user/syncUser',
+    method: 'get'
+  })
+}

src/views/system/user/index.vue

@@ -4,44 +4,35 @@
          <!--部门数据-->
          <el-col :span="4" :xs="24">
             <div class="head-container">
-               <el-input
+               <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search"
-                  v-model="deptName"
+                  style="margin-bottom: 20px" />
-                  placeholder="请输入部门名称"
-                  clearable
-                  prefix-icon="Search"
-                  style="margin-bottom: 20px"
-               />
             </div>
             <div class="head-container">
-               <el-tree
+               <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }"
-                  :data="deptOptions"
+                  :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id"
-                  :props="{ label: 'label', children: 'children' }"
+                  highlight-current default-expand-all @node-click="handleNodeClick" />
-                  :expand-on-click-node="false"
-                  :filter-node-method="filterNode"
-                  ref="deptTreeRef"
-                  node-key="id"
-                  highlight-current
-                  default-expand-all
-                  @node-click="handleNodeClick"
-               />
             </div>
          </el-col>
          <!--用户数据-->
          <el-col :span="20" :xs="24">
             <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
                <el-form-item label="用户名称" prop="userName">
-                  <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter="handleQuery"/>
+                  <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
+                     @keyup.enter="handleQuery" />
                </el-form-item>
                <el-form-item label="手机号码" prop="phonenumber">
-                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter="handleQuery"/>
+                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
+                     @keyup.enter="handleQuery" />
                </el-form-item>
                <el-form-item label="状态" prop="status">
                   <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-                     <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                     <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
+                        :value="dict.value" />
                   </el-select>
                </el-form-item>
                <el-form-item label="创建时间" style="width: 308px;">
-                  <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                  <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+                     start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
                </el-form-item>
                <el-form-item>
                   <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -51,19 +42,28 @@
 
             <el-row :gutter="10" class="mb8">
                <el-col :span="1.5">
-                  <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
+                  <el-button type="primary" plain icon="Plus" @click="handleAdd"
+                     v-hasPermi="['system:user:add']">新增</el-button>
                </el-col>
                <el-col :span="1.5">
-                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
+                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+                     v-hasPermi="['system:user:edit']">修改</el-button>
                </el-col>
                <el-col :span="1.5">
-                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
+                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+                     v-hasPermi="['system:user:remove']">删除</el-button>
                </el-col>
                <el-col :span="1.5">
-                  <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
+                  <el-button type="info" plain icon="Upload" @click="handleImport"
+                     v-hasPermi="['system:user:import']">excel导入</el-button>
                </el-col>
                <el-col :span="1.5">
-                  <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
+                  <el-button type="info" plain icon="Upload" @click="handleImportFromLis"
+                     v-hasPermi="['system:user:import']">老lis导入</el-button>
+               </el-col>
+               <el-col :span="1.5">
+                  <el-button type="warning" plain icon="Download" @click="handleExport"
+                     v-hasPermi="['system:user:export']">导出</el-button>
                </el-col>
                <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
             </el-row>
@@ -71,18 +71,18 @@
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
                <el-table-column type="selection" width="50" align="center" />
                <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-               <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+               <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
-               <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+                  :show-overflow-tooltip="true" />
-               <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+               <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
-               <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+                  :show-overflow-tooltip="true" />
+               <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+                  :show-overflow-tooltip="true" />
+               <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
+                  v-if="columns[4].visible" width="120" />
                <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
                   <template #default="scope">
-                     <el-switch
+                     <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
-                        v-model="scope.row.status"
+                        @change="handleStatusChange(scope.row)"></el-switch>
-                        active-value="0"
-                        inactive-value="1"
-                        @change="handleStatusChange(scope.row)"
-                     ></el-switch>
                   </template>
                </el-table-column>
                <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
@@ -93,27 +93,26 @@
                <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
                   <template #default="scope">
                      <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
-                        <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                        <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                           v-hasPermi="['system:user:edit']"></el-button>
                      </el-tooltip>
                      <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
-                        <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+                        <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                           v-hasPermi="['system:user:remove']"></el-button>
                      </el-tooltip>
                      <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
-                         <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
+                        <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)"
+                           v-hasPermi="['system:user:resetPwd']"></el-button>
                      </el-tooltip>
                      <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
-                        <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                        <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"
+                           v-hasPermi="['system:user:edit']"></el-button>
                      </el-tooltip>
                   </template>
                </el-table-column>
             </el-table>
-            <pagination
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-               v-show="total > 0"
+               v-model:limit="queryParams.pageSize" @pagination="getList" />
-               :total="total"
-               v-model:page="queryParams.pageNum"
-               v-model:limit="queryParams.pageSize"
-               @pagination="getList"
-            />
          </el-col>
       </el-row>
 
@@ -128,14 +127,9 @@
                </el-col>
                <el-col :span="12">
                   <el-form-item label="归属部门" prop="deptId">
-                     <el-tree-select
+                     <el-tree-select v-model="form.deptId" :data="deptOptions"
-                        v-model="form.deptId"
+                        :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
-                        :data="deptOptions"
+                        placeholder="请选择归属部门" check-strictly />
-                        :props="{ value: 'id', label: 'label', children: 'children' }"
-                        value-key="id"
-                        placeholder="请选择归属部门"
-                        check-strictly
-                     />
                   </el-form-item>
                </el-col>
             </el-row>
@@ -159,7 +153,8 @@
                </el-col>
                <el-col :span="12">
                   <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-                     <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
+                     <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20"
+                        show-password />
                   </el-form-item>
                </el-col>
             </el-row>
@@ -167,23 +162,16 @@
                <el-col :span="12">
                   <el-form-item label="用户性别">
                      <el-select v-model="form.sex" placeholder="请选择">
-                        <el-option
+                        <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
-                           v-for="dict in sys_user_sex"
+                           :value="dict.value"></el-option>
-                           :key="dict.value"
-                           :label="dict.label"
-                           :value="dict.value"
-                        ></el-option>
                      </el-select>
                   </el-form-item>
                </el-col>
                <el-col :span="12">
                   <el-form-item label="状态">
                      <el-radio-group v-model="form.status">
-                        <el-radio
+                        <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
-                           v-for="dict in sys_normal_disable"
+                           }}</el-radio>
-                           :key="dict.value"
-                           :label="dict.value"
-                        >{{ dict.label }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
@@ -192,26 +180,16 @@
                <el-col :span="12">
                   <el-form-item label="岗位">
                      <el-select v-model="form.postIds" multiple placeholder="请选择">
-                        <el-option
+                        <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName"
-                           v-for="item in postOptions"
+                           :value="item.postId" :disabled="item.status == 1"></el-option>
-                           :key="item.postId"
-                           :label="item.postName"
-                           :value="item.postId"
-                           :disabled="item.status == 1"
-                        ></el-option>
                      </el-select>
                   </el-form-item>
                </el-col>
                <el-col :span="12">
                   <el-form-item label="角色">
                      <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                        <el-option
+                        <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName"
-                           v-for="item in roleOptions"
+                           :value="item.roleId" :disabled="item.status == 1"></el-option>
-                           :key="item.roleId"
-                           :label="item.roleName"
-                           :value="item.roleId"
-                           :disabled="item.status == 1"
-                        ></el-option>
                      </el-select>
                   </el-form-item>
                </el-col>
@@ -234,18 +212,9 @@
 
       <!-- 用户导入对话框 -->
       <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
-         <el-upload
+         <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-            ref="uploadRef"
+            :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-            :limit="1"
+            :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-            accept=".xlsx, .xls"
-            :headers="upload.headers"
-            :action="upload.url + '?updateSupport=' + upload.updateSupport"
-            :disabled="upload.isUploading"
-            :on-progress="handleFileUploadProgress"
-            :on-success="handleFileSuccess"
-            :auto-upload="false"
-            drag
-         >
             <el-icon class="el-icon--upload"><upload-filled /></el-icon>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
             <template #tip>
@@ -254,7 +223,8 @@
                      <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
                   </div>
                   <span>仅允许导入xls、xlsx格式文件。</span>
-                  <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+                  <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                     @click="importTemplate">下载模板</el-link>
                </div>
             </template>
          </el-upload>
@@ -270,7 +240,8 @@
 
 <script setup name="User">
 import { getToken } from "@/utils/auth";
-import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
+import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect, importFromLis } from "@/api/system/user";
+import { deleteConfirm } from "@/hooks/messageBox"
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
@@ -388,13 +359,13 @@ function handleDelete(row) {
    }).then(() => {
       getList();
       proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+   }).catch(() => { });
 };
 /** 导出按钮操作 */
 function handleExport() {
    proxy.download("system/user/export", {
       ...queryParams.value,
-  },`user_${new Date().getTime()}.xlsx`);
+   }, `user_${new Date().getTime()}.xlsx`);
 };
 /** 用户状态修改  */
 function handleStatusChange(row) {
@@ -437,7 +408,7 @@ function handleResetPwd(row) {
       resetUserPwd(row.userId, value).then(response => {
          proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
       });
-  }).catch(() => {});
+   }).catch(() => { });
 };
 /** 选择条数  */
 function handleSelectionChange(selection) {
@@ -450,6 +421,20 @@ function handleImport() {
    upload.title = "用户导入";
    upload.open = true;
 };
+
+//从老的lis系统导入用户
+async function handleImportFromLis() {
+   const isConfirmed = await deleteConfirm('是否导入老lis数据？', { title: '导入数据', type: 'warning', confirmButtonText: '确认导入' })
+   if (isConfirmed) {
+      loading.value = true
+      await importFromLis().then(response => {
+         proxy.$modal.msgSuccess("导入成功");
+         getList();
+      });
+      loading.value = false
+   }
+
+}
 /** 下载模板操作 */
 function importTemplate() {
    proxy.download("system/user/importTemplate", {