CanadaMes.git - Gitblit

			@@ -11,8 +11,7 @@
			<el-row :gutter="20">
			<!--搜索与添加区域-->
			<el-col :span="6">
			<el-input :placeholder="$t('langUsernamePlaceholder')" v-model="queryInfo.username" clearable
			@clear="getUserList">
			<el-input :placeholder= "$t('langUsernamePlaceholder')" v-model="queryInfo.username" clearable @clear="getUserList">
			</el-input>
			</el-col>
			<el-col :span="6">
			@@ -36,7 +35,11 @@
			<el-table-column :label="$t('langCreateTime')" prop="createTime"></el-table-column>
			<el-table-column :label="$t('langDisabled')">
			<template slot-scope="scope">
			<el-switch :active-value="0" :inactive-value="1" v-model="scope.row.state" @change="stateChange(scope.row)">
			<el-switch
			:active-value="0"
			:inactive-value="1"
			v-model="scope.row.state"
			@change="stateChange(scope.row)">
			</el-switch>
			</template>
			</el-table-column>
			@@ -52,23 +55,37 @@
			<template slot-scope="scope">
			<!--修改-->
			<el-tooltip effect="dark" :content="$t('langEdit')" placement="top" :enterable="false">
			<el-button type="primary" icon="el-icon-edit" size="mini" @click="showEditDialog(scope.row.id)"></el-button>
			<el-button type="primary" icon="el-icon-edit" size="mini"
			@click="showEditDialog(scope.row.id)"></el-button>
			</el-tooltip>
			<!--删除-->
			<el-tooltip effect="dark" :content="$t('langDelete')" placement="top" :enterable="false">
			<el-button type="danger" icon="el-icon-delete" size="mini" @click="removeUserById(scope.row)"></el-button>
			<el-button type="danger" icon="el-icon-delete" size="mini"
			@click="removeUserById(scope.row)"></el-button>
			</el-tooltip>
			</template>
			</el-table-column>
			</el-table>
			<!--分页区域-->
			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
			:current-page="queryInfo.pageNum" :page-sizes="[6, 12, 18, 24]" :page-size="queryInfo.pageSize"
			:total="userList.total" :pager-count="7" :layout="layout">
			<el-pagination
			@size-change="handleSizeChange"
			@current-change="handleCurrentChange"
			:current-page="queryInfo.pageNum"
			:page-sizes="[6, 12, 18, 24]"
			:page-size="queryInfo.pageSize"
			:total="userList.total"

			:pager-count="7"
			:layout="layout"
			>
			</el-pagination>
			</el-card>
			<!--添加用户的对话框-->
			<el-dialog :title="$t('langAddUserTitle')" :visible.sync="addDialogVisible" width="50%" @close="addDialogClosed">
			<el-dialog
			:title="$t('langAddUserTitle')"
			:visible.sync="addDialogVisible"
			width="50%"
			@close="addDialogClosed">
			<!--内容主体区域-->
			<el-form :model="addUserForm" :rules="addUserRules" ref="addUserRef" label-width="100px">
			<el-form-item :label="$t('langUsername')" prop="username">
			@@ -84,14 +101,20 @@

			<el-form-item :label="$t('langState')" prop="state">
			<el-select v-model="addUserForm.state">
			<el-option v-for="(item, index) in options" :key="index" :value="item.value" :label="item.label">
			<el-option v-for="(item,index) in options"
			:key="index"
			:value="item.value"
			:label="item.label">
			</el-option>
			</el-select>
			</el-form-item>

			<el-form-item label="角色" prop="roleId">
			<el-select filterable v-model="addUserForm.roleId" placeholder="请选择">
			<el-option v-for="item in roleList" :key="item.id" :value="item.id" :label="item.name">
			<el-form-item :label="$t('role')" prop="roleId">
			<el-select filterable v-model="addUserForm.roleId" :placeholder="$t('langSelect')" >
			<el-option v-for="item in roleList"
			:key="item.id"
			:value="item.id"
			:label="item.name">
			</el-option>
			</el-select>
			</el-form-item>
			@@ -102,15 +125,21 @@
			</span>
			</el-dialog>
			<!--修改用户的对话框-->
			<el-dialog :title="$t('langEditUserTitle')" :visible.sync="editDialogVisible" width="50%">
			<el-dialog
			:title="$t('langEditUserTitle')"
			:visible.sync="editDialogVisible"
			width="50%">
			<!--内容主体区域-->
			<el-form :model="editUserForm" :rules="addUserRules" ref="addCategoryRef" label-width="100px">
			<el-form-item :label="$t('langUsername')" prop="username">
			<el-input v-model="editUserForm.username" disabled></el-input>
			</el-form-item>
			<el-form-item :label="$t('role')" prop="roleId">
			<el-select filterable v-model="editUserForm.roleId" placeholder="请选择">
			<el-option v-for="item in roleList" :key="item.id" :value="item.id" :label="item.name">
			<el-select filterable v-model="editUserForm.roleId" :placeholder="$t('langSelect')" >
			<el-option v-for="item in roleList"
			:key="item.id"
			:value="item.id"
			:label="item.name">
			</el-option>
			</el-select>
			</el-form-item>
			@@ -119,7 +148,10 @@
			</el-form-item>
			<el-form-item :label="$t('langDisabled')" prop="state">
			<el-select v-model="editUserForm.state">
			<el-option v-for="(item, index) in options" :key="index" :value="item.value" :label="item.label">
			<el-option v-for="(item,index) in options"
			:key="index"
			:value="item.value"
			:label="item.label">
			</el-option>
			</el-select>
			</el-form-item>
			@@ -198,7 +230,6 @@
			getUserList () {
			selectPage(this.queryInfo).then(res => {
			this.userList.records = res.data.records;

			this.userList.total = res.data.total
			});

			@@ -311,7 +342,8 @@
			if (!valid) return;

			saveOrUpdate(this.editUserForm).then(() => {
			this.$message.success("修改用户成功");
			const 修改用户成功 = this.$t('修改用户成功');
			this.$message.success(修改用户成功);
			// 隐藏添加分类对话框
			this.editDialogVisible = false;
			// 重新获取分类列表