升级依赖到最新版本

RuoYi

2022-04-09 299e69968ee590150fa6302e224e8b5a7a3d7384

 src/views/system/user/index.vue

@@ -8,8 +8,7 @@
                  v-model="deptName"

                  placeholder="请输入部门名称"

                  clearable

                  size="small"

                  prefix-icon="el-icon-search"

                  prefix-icon="Search"

                  style="margin-bottom: 20px"

               />

            </div>

@@ -33,7 +32,6 @@
                     v-model="queryParams.userName"

                     placeholder="请输入用户名称"

                     clearable

                     size="small"

                     style="width: 240px"

                     @keyup.enter="handleQuery"

                  />

@@ -43,7 +41,6 @@
                     v-model="queryParams.phonenumber"

                     placeholder="请输入手机号码"

                     clearable

                     size="small"

                     style="width: 240px"

                     @keyup.enter="handleQuery"

                  />

@@ -53,7 +50,6 @@
                     v-model="queryParams.status"

                     placeholder="用户状态"

                     clearable

                     size="small"

                     style="width: 240px"

                  >

                     <el-option

@@ -64,11 +60,9 @@
                     />

                  </el-select>

               </el-form-item>

               <el-form-item label="创建时间">

               <el-form-item label="创建时间" style="width: 308px;">

                  <el-date-picker

                     v-model="dateRange"

                     size="small"

                     style="width: 240px"

                     value-format="YYYY-MM-DD"

                     type="daterange"

                     range-separator="-"

@@ -77,8 +71,8 @@
                  ></el-date-picker>

               </el-form-item>

               <el-form-item>

                  <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>

                  <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>

                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>

                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>

               </el-form-item>

            </el-form>



@@ -88,7 +82,6 @@
                     type="primary"

                     plain

                     icon="Plus"

                     size="mini"

                     @click="handleAdd"

                     v-hasPermi="['system:user:add']"

                  >新增</el-button>

@@ -98,7 +91,6 @@
                     type="success"

                     plain

                     icon="Edit"

                     size="mini"

                     :disabled="single"

                     @click="handleUpdate"

                     v-hasPermi="['system:user:edit']"

@@ -109,7 +101,6 @@
                     type="danger"

                     plain

                     icon="Delete"

                     size="mini"

                     :disabled="multiple"

                     @click="handleDelete"

                     v-hasPermi="['system:user:remove']"

@@ -120,7 +111,6 @@
                     type="info"

                     plain

                     icon="Upload"

                     size="mini"

                     @click="handleImport"

                     v-hasPermi="['system:user:import']"

                  >导入</el-button>

@@ -130,7 +120,6 @@
                     type="warning"

                     plain

                     icon="Download"

                     size="mini"

                     @click="handleExport"

                     v-hasPermi="['system:user:export']"

                  >导出</el-button>

@@ -155,42 +144,45 @@
                     ></el-switch>

                  </template>

               </el-table-column>

               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="150">

               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">

                  <template #default="scope">

                     <span>{{ parseTime(scope.row.createTime) }}</span>

                  </template>

               </el-table-column>

               <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">

               <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">

                  <template #default="scope">

                     <el-button

                        size="mini"

                        v-if="scope.row.userId !== 1"

                        type="text"

                        icon="Edit"

                        @click="handleUpdate(scope.row)"

                        v-hasPermi="['system:user:edit']"

                     >修改</el-button>

                     <el-button

                        size="mini"

                        v-if="scope.row.userId !== 1"

                        type="text"

                        icon="Delete"

                        @click="handleDelete(scope.row)"

                        v-hasPermi="['system:user:remove']"

                     >删除</el-button>

                     <el-dropdown v-if="scope.row.userId !== 1" @command="(command) => handleCommand(command, scope.row)">

                        <span class="el-dropdown-link" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">

                           <el-icon><d-arrow-right /></el-icon>更多

                        </span>

                        <template #dropdown>

                           <el-dropdown-menu>

                              <el-dropdown-item command="handleResetPwd" icon="Key"

                                 v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>

                              <el-dropdown-item command="handleAuthRole" icon="CircleCheck"

                                 v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>

                           </el-dropdown-menu>

                        </template>

                     </el-dropdown>

                     <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">

                        <el-button

                           type="text"

                           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

                           type="text"

                           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

                           type="text"

                           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

                           type="text"

                           icon="CircleCheck"

                           @click="handleAuthRole(scope.row)"

                           v-hasPermi="['system:user:edit']"

                        ></el-button>

                     </el-tooltip>

                  </template>

               </el-table-column>

            </el-table>

@@ -390,7 +382,7 @@
  // 设置上传的请求头部

  headers: { Authorization: "Bearer " + getToken() },

  // 上传的地址

  url: import.meta.env.VITE_APP_BASE_API + "system/user/importData"

  url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"

});

// 列显隐信息

const columns = ref([

@@ -417,7 +409,7 @@
    userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],

    nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],

    password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],

    email: [{ type: "email", message: "'请输入正确的邮箱地址", trigger: ["blur", "change"] }],

    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],

    phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]

  }

});

@@ -451,7 +443,7 @@
/** 节点单击事件 */

function handleNodeClick(data) {

  queryParams.value.deptId = data.id;

  getList();

  handleQuery();

};

/** 搜索按钮操作 */

function handleQuery() {

@@ -548,7 +540,7 @@
  upload.open = false;

  upload.isUploading = false;

  proxy.$refs["uploadRef"].clearFiles();

  proxy.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });

  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });

  getList();

};

/** 提交上传文件 */

@@ -596,7 +588,7 @@
    roleOptions.value = response.roles;

    open.value = true;

    title.value = "添加用户";

    form.password.value = initPassword.value;

    form.value.password = initPassword.value;

  });

};

/** 修改按钮操作 */