Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/views/system/role/index.vue

@@ -64,7 +64,7 @@
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.orgType" />
             </template>
           </el-table-column>
-      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true"  />
+<!--      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true"  />-->
       <el-table-column label="状态" align="center" >
         <template slot-scope="scope">
 <!--          <el-switch v-model="scope.row.status" active-text inactive-text active-value="0" inactive-value="1"
@@ -116,7 +116,7 @@
               </el-select>
             </el-form-item>
 
-        <el-form-item prop="roleKey">
+<!--        <el-form-item prop="roleKey">
           <span slot="label">
             <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
               <i class="el-icon-question"></i>
@@ -124,7 +124,7 @@
             权限字符
           </span>
           <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="角色顺序" prop="roleSort">
           <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
         </el-form-item>
@@ -161,9 +161,9 @@
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />
         </el-form-item>
-        <el-form-item label="权限字符">
+<!--        <el-form-item label="权限字符">
           <el-input v-model="form.roleKey" :disabled="true" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="权限范围">
           <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
             <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label"
@@ -271,9 +271,9 @@ export default {
         roleName: [
           { required: true, message: "角色名称不能为空", trigger: "blur" }
         ],
-        roleKey: [
+       /*  roleKey: [
           { required: true, message: "权限字符不能为空", trigger: "blur" }
-        ],
+        ], */
         roleSort: [
           { required: true, message: "角色顺序不能为空", trigger: "blur" }
         ]

src/views/system/user/index.vue

@@ -70,28 +70,23 @@
           <!--          </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
-
         <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="id" prop="id" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="username" prop="username" v-if="columns[1].visible"
+          <el-table-column label="用户名" align="center" key="username" prop="username" v-if="columns[0].visible" />
+          <el-table-column label="姓名" align="center" key="name" prop="name" v-if="columns[1].visible"
             :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="name" prop="name" v-if="columns[2].visible"
+          <el-table-column label="手机" align="center" key="phone" prop="phone" v-if="columns[2].visible"
             :show-overflow-tooltip="true" />
           <el-table-column label="所属机构" align="center" key="orgName" prop="orgName" v-if="columns[3].visible"
             :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible" width="120" />
-  
-          <el-table-column label="状态" align="center" key="isLock" prop="isLock" v-if="columns[5].visible" width="80">
+          <el-table-column label="状态" align="center" key="isLock" prop="isLock" v-if="columns[4].visible" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.isLock" />
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
+          <el-table-column label="是否管理人员" align="center" key="phone" prop="phone" v-if="columns[5].visible" width="120" />
+          <el-table-column label="登录IP" align="center" key="lastIp" prop="lastIp" v-if="columns[6].visible" width="120" />
+          <el-table-column label="登录时间" align="center" key="lastTime" prop="lastTime" v-if="columns[7].visible" width="120" />
           <el-table-column
             label="操作"
             align="center"
@@ -209,28 +204,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!--        <el-row>-->
-        <!--          <el-col :span="12">-->
-        <!--            <el-form-item label="岗位">-->
-        <!--              <el-select v-model="form.orgId" multiple placeholder="请选择岗位">-->
-        <!--                <el-option-->
-        <!--                  v-for="item in postOptions"-->
-        <!--                  :key="item.postId"-->
-        <!--                  :label="item.postName"-->
-        <!--                  :value="item.postId"-->
-        <!--                  :disabled="item.status == 1"-->
-        <!--                ></el-option>-->
-        <!--              </el-select>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
-        <!--        <el-row>-->
-        <!--          <el-col :span="24">-->
-        <!--            <el-form-item label="备注">-->
-        <!--              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -333,13 +306,14 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
-        { key: 2, label: `用户昵称`, visible: true },
-        { key: 3, label: `机构`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
-        { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
+        { key: 0, label: `用户名`, visible: true },
+        { key: 1, label: `姓名`, visible: true },
+        { key: 2, label: `手机`, visible: true },
+        { key: 3, label: `所属机构`, visible: true },
+        { key: 4, label: `状态`, visible: true },
+        { key: 5, label: `是否管理人员`, visible: true },
+        { key: 6, label: `登录IP`, visible: true },
+        { key: 7, label: `登录时间`, visible: true }
       ],
       // 表单校验
       rules: {