基本表类别管理增加查看

src/views/basicTable/category.vue

@@ -66,6 +66,13 @@
         ></el-table-column>
         <el-table-column label="操作" min-width="120" align="center">
           <template slot-scope="{ row }">
+             <el-link
+              @click="look(row)"
+              icon="el-icon-view"
+              type="primary"
+              :underline="false"
+              >查看</el-link
+            >
             <el-link
               @click="edit(row)"
               icon="el-icon-edit"

src/views/summary/components/search.vue

@@ -1,114 +0,0 @@
-<template>
-  <div class="search">
-    <el-form :inline="true" :model="searchParams" size="small">
-     
-      <el-form-item label="考核指标：">
-        <el-select v-model="searchParams.code" clearable filterable>
-          <el-option
-            v-for="(item, index) of indexList"
-            :key="index"
-            :label="item.code"
-            :value="item.code"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-       <el-form-item label="考核内容：">
-       <el-input
-          placeholder="请输入考核内容"
-          v-model="searchParams.content"
-          clearable
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="牵头单位：">
-        <el-input
-          placeholder="请输入牵头单位"
-          v-model="searchParams.utils"
-          clearable
-        ></el-input>
-      </el-form-item>
-       <el-form-item label="牵头部门：">
-        <el-select v-model="searchParams.code" clearable filterable>
-          <el-option
-            v-for="(item, index) of indexList"
-            :key="index"
-            :label="item.code"
-            :value="item.code"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-       <el-form-item label="配合部门：">
-        <el-select v-model="searchParams.code" clearable filterable>
-          <el-option
-            v-for="(item, index) of indexList"
-            :key="index"
-            :label="item.code"
-            :value="item.code"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-button type="primary" size="small" class="search-btn" @click="search"
-        >查询</el-button
-      >
-      <el-button
-        type="default"
-        size="small"
-        class="search-btn"
-        @click="
-          clear();
-          search();
-        "
-        >清空</el-button
-      >
-    </el-form>
-  </div>
-</template>
-
-<script>
-import api from "@/api/basicTable/category";
-export default {
-  data() {
-    return {
-      searchParams: {
-        year: "",
-        code: "",
-        name: "",
-      },
-      indexList: [],
-    };
-  },
-  methods: {
-    clear() {
-      this.searchParams = {
-        year: "",
-        code: "",
-        name: "",
-      };
-    },
-    search() {
-      this.$emit("search", this.searchParams);
-    },
-    getCodeByYear() {
-      api
-        .getCodeByYear(this.searchParams.year)
-        .then((res) => {
-          this.codeList = res.data.data;
-        })
-        .catch(() => {
-          this.codeList = [];
-        });
-    },
-  },
-  watch: {
-    "searchParams.year"(val) {
-      console.log(val);
-      if (!val) {
-        this.$set(this.searchParams, "code", "");
-        this.codeList = [];
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-</style>

src/views/summary/components/searchReward.vue

@@ -1,117 +0,0 @@
-<template>
-  <div class="search">
-    <el-form :inline="true" :model="searchParams" size="small">
-     
-      <el-form-item label="一级指标：">
-        <el-select v-model="searchParams.code" clearable filterable>
-          <el-option
-            v-for="(item, index) of indexList"
-            :key="index"
-            :label="item.code"
-            :value="item.code"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-       <el-form-item label="表二级指标：">
-        <el-select v-model="searchParams.code" clearable filterable>
-          <el-option
-            v-for="(item, index) of indexList"
-            :key="index"
-            :label="item.code"
-            :value="item.code"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-       <el-form-item label="考核内容：">
-       <el-input
-          placeholder="请输入考核内容"
-          v-model="searchParams.content"
-          clearable
-        ></el-input>
-      </el-form-item>
-       <el-form-item label="牵头部门：">
-        <el-select v-model="searchParams.code" clearable filterable>
-          <el-option
-            v-for="(item, index) of indexList"
-            :key="index"
-            :label="item.code"
-            :value="item.code"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-       <el-form-item label="配合部门：">
-        <el-select v-model="searchParams.code" clearable filterable>
-          <el-option
-            v-for="(item, index) of indexList"
-            :key="index"
-            :label="item.code"
-            :value="item.code"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-button type="primary" size="small" class="search-btn" @click="search"
-        >查询</el-button
-      >
-      <el-button
-        type="default"
-        size="small"
-        class="search-btn"
-        @click="
-          clear();
-          search();
-        "
-        >清空</el-button
-      >
-    </el-form>
-  </div>
-</template>
-
-<script>
-import api from "@/api/basicTable/category";
-export default {
-  data() {
-    return {
-      searchParams: {
-        year: "",
-        code: "",
-        name: "",
-      },
-      indexList: [],
-    };
-  },
-  methods: {
-    clear() {
-      this.searchParams = {
-        year: "",
-        code: "",
-        name: "",
-      };
-    },
-    search() {
-      this.$emit("search", this.searchParams);
-    },
-    getCodeByYear() {
-      api
-        .getCodeByYear(this.searchParams.year)
-        .then((res) => {
-          this.codeList = res.data.data;
-        })
-        .catch(() => {
-          this.codeList = [];
-        });
-    },
-  },
-  watch: {
-    "searchParams.year"(val) {
-      console.log(val);
-      if (!val) {
-        this.$set(this.searchParams, "code", "");
-        this.codeList = [];
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-</style>

src/views/system/user/index.vue

@@ -61,6 +61,7 @@
               </el-tag>
             </template>
           </el-table-column>
+           <el-table-column prop="levelName" label="部门" sortable="custom" show-overflow-tooltip min-width="100"/>
           <el-table-column prop="levelName" label="职级" sortable="custom" show-overflow-tooltip min-width="100"/>
           <el-table-column prop="positionName" label="岗位" sortable="custom" show-overflow-tooltip min-width="100"/>
           <el-table-column label="创建时间" sortable="custom" show-overflow-tooltip min-width="160">
@@ -110,10 +111,15 @@
               <el-select filterable clearable v-model="editForm.levelId" size="small" placeholder="-请选择职级-">
                 <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id"/>
               </el-select>
+            </el-form-item>
+             <el-form-item label="部门:" prop="roleIds">
+              <el-select v-model="editForm.roleIds" placeholder="请选择部门" class="ele-block" clearable multiple>
+                <el-option v-for="(item,index) in roleList" :key="index" :label="item.name" :value="item.id"/>
+              </el-select>
             </el-form-item>
             <el-form-item label="角色:" prop="roleIds">
               <el-select v-model="editForm.roleIds" placeholder="请选择角色" class="ele-block" clearable multiple>
-                <el-option v-for="(item,index) in roleList" :key="index" :label="item.name" :value="item.id"/>
+                <el-option v-for="(item,index) in departmentsList" :key="index" :label="item.name" :value="item.id"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -179,6 +185,7 @@ export default {
       roleList: [],  // 角色列表
       levelList:[], // 职级列表
       positionList:[], // 岗位列表
+      departmentsList: [], // 部门列表
 
     }
   },