优化机构管理和角色管理代码

src/views/system/dept/index.vue

@@ -74,30 +74,41 @@
     </el-row>
 
         <el-table v-loading="loading" :data="deptList" @selection-change="handleSelectionChange">
-          <el-table-column prop="name" label="机构名称" width="260"></el-table-column>
-          <el-table-column prop="sort" label="排序" width="200"></el-table-column>
-          <el-table-column prop="isLock" label="状态" width="100">
-            <template slot-scope="scope">
+          <el-table-column label="序号" align="center" min-width="30">
+            <template v-slot:default="scope">
+              <span v-text="getPageIndex(scope.$index)"> </span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="code" label="编码" ></el-table-column>
+          <el-table-column prop="type" label="机构类型" >
+            <template v-slot="scope">
+              <dict-tag :options="dict.type.sys_org_type" :value="scope.row.type"/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="机构名称" ></el-table-column>
+          <el-table-column prop="isLock" label="状态" >
+            <template v-slot="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" width="200">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+          <el-table-column prop="weatherCityCode" label="天气区域编码" ></el-table-column>
+          <el-table-column prop="address" label="地址" ></el-table-column>
+          <el-table-column label="负责人及电话" align="center" >
+            <template v-slot:default="scope">
+              <span v-text="scope.row.manager"></span>-
+              <span v-text="scope.row.managerPhone"> </span>
             </template>
           </el-table-column>
 
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-
           <router-link :to="'/system/dept-extend/extend/'+ scope.row.id " class="link-type">
-
               <el-button
               size="mini"
               type="text"
-              icon="el-icon-edit"
+              icon="el-icon-plus"
               v-hasPermi="['system:dept:extend']"
-              >扩展</el-button
+              >补充信息</el-button
             >
           </router-link>
           <el-button
@@ -108,13 +119,6 @@
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
-          >新增</el-button>
-          <el-button
             v-if="scope.row.parentId != 0"
             size="mini"
             type="text"
@@ -207,7 +211,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Dept",
-  dicts: ['sys_normal_disable'],
+  dicts: ['sys_normal_disable','sys_org_type'],
   components: { Treeselect },
   data() {
     return {
@@ -282,6 +286,11 @@ export default {
     this.getList();
   },
   methods: {
+    getPageIndex($index) {
+      //表格序号
+      return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+
+    },
      //自定义数据
      tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
@@ -403,6 +412,7 @@ export default {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
+            this.getDeptTree();
           });
         }
       });
@@ -414,6 +424,7 @@ export default {
             this.$modal.msgSuccess("新增成功");
             this.open = false;
             this.getList();
+            this.getDeptTree();
           });
         }
       });
@@ -425,6 +436,7 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
+        this.getDeptTree();
       }).catch(() => {});
     },
     // 多选框选中数据

src/views/system/role/index.vue

@@ -52,38 +52,27 @@
     </el-row>
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleSort" width="120" />
-      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
-     
-
-
-
-
-
-      <el-table-column label="机构类型" align="center" key="orgType" prop="orgType" width="150">
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column label="序号" align="center" width="50">
+        <template v-slot:default="scope">
+          <span v-text="getPageIndex(scope.$index)"> </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true"  />
+      <el-table-column label="机构类型" align="center" key="orgType" prop="orgType" >
             <template slot-scope="scope">
               <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" width="150" />
-      <el-table-column label="显示顺序" prop="roleSort" width="100" />
-      <el-table-column label="状态" align="center" width="100">
+      <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"
+<!--          <el-switch v-model="scope.row.status" active-text inactive-text active-value="0" inactive-value="1"
             @change="handleStatusChange(scope.row)">
-
-          </el-switch>
+          </el-switch>-->
+            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
         </template>
       </el-table-column>
-
-
       <el-table-column label="创建时间" align="center" prop="createTime" width="150">
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -295,6 +284,11 @@ export default {
     this.getList();
   },
   methods: {
+    getPageIndex($index) {
+      //表格序号
+      return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+
+    },
     /** 查询角色列表 */
     getList() {
       this.loading = true;