sunlupeng hace 1 año
padre
commit
5a4405be27
Se han modificado 2 ficheros con 17 adiciones y 15 borrados
  1. 12 9
      src/views/personnel/employee/data.vue
  2. 5 6
      src/views/personnel/employee/index.vue

+ 12 - 9
src/views/personnel/employee/data.vue

@@ -15,10 +15,9 @@
       <el-table-column label="当前可用年假" align="center" prop="remainingAnnualLeave"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)"
-                     v-hasPermi="['personnel:employee:detail']">详情</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['personnel:employee:delete']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)">详情</el-button>
+          <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['employee:info:delete']">删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -232,15 +231,19 @@ export default {
     };
   },
   created() {
-    const dictId = this.$route.params && this.$route.params.Id;
-    this.getType(dictId);
-    this.getTypeList();
+    const dataId = this.$route.params && this.$route.params.Id;
+    this.getList(dataId);
   },
   methods: {
     /** 查询字典数据列表 */
-    getList() {
+    getList(dataId) {
       this.loading = true;
-      listHistoryData(this.queryParams).then(response => {
+      let queryParams = {
+        pageNo: 1,
+        pageSize: 10,
+        id: dataId,
+      };
+      listHistoryData(queryParams).then(response => {
         this.dataList = response.data.list;
         this.total = response.data.total;
         this.loading = false;

+ 5 - 6
src/views/personnel/employee/index.vue

@@ -21,11 +21,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['personnel:employee:create']">新增</el-button>
+                   v-hasPermi="['employee:info:create']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['personnel:employee:export']">导出</el-button>
+                   v-hasPermi="['employee:info:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -53,11 +53,10 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['personnel:employee:update']">修改</el-button>
+                     v-hasPermi="['employee:info:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['personnel:employee:delete']">删除</el-button>
-          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)"
-                     v-hasPermi="['personnel:employee:detail']">详情</el-button>
+                     v-hasPermi="['employee:info:delete']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)">详情</el-button>
         </template>
       </el-table-column>
     </el-table>