修改部门角色联动

src/api/assessingTarget/basicTarget.js

@@ -1,14 +1,12 @@
 import axios from "@/config/axios"
 export default{
     getList(params){
-        console.log(params)
         return axios.get("/basictask/index",{params})
     },
     updatePoints(params){
         return axios.post('/basictask/updateExpectedPoints',params)
     },
     updateLeaderDept(params){
-        console.log(params)
         return axios.post('/basictask/updateLeaderDept',params)
     }
 }

src/api/assessingTarget/commonquotatask.js

@@ -1,7 +1,6 @@
 import axios from "@/config/axios"
 export default{
     getList(params){
-        console.log(params)
         return axios.get("/commonquotatask/index",{params})
     }
 }

src/api/assessingTarget/reward.js

@@ -1,7 +1,6 @@
 import axios from "@/config/axios"
 export default {
     getList(params) {
-        console.log(params)
         return axios.get("/specialpower/index", { params })
     },
     updatePoints(params) {

src/api/basicTable/category.js

@@ -2,7 +2,6 @@ import axios from "@/config/axios"
 
 export default {
   add(params) {
-    console.log(params)
     return axios.post('/category/add', params)
   },
   getList(params) {

src/config/setting.js

@@ -4,7 +4,6 @@
 export default {
     version: '1.0',
     name: 'JNDZ考核管理系统',  // 项目名称
-    
     baseURL: 'http://47.98.157.120:9031/api/',  // 接口地址
     // baseURL: 'http://127.0.0.1:9031/api/',  // 接口地址
     whiteList: ['/login', '/forget'],  // 路由白名单(不需要登录的)

src/store/modules/user.js

@@ -91,6 +91,5 @@ function menusToRoute(menus) {
             });
         }
     });
-    console.log(route)
     return route;
 }

src/views/assessingTarget/basicTarget.vue

@@ -214,7 +214,6 @@ export default {
     },
     showLeaderDept(data) {
       this.showDep = true;
-      console.log(data);
       data.leaderDept = (data.leaderDept && data.leaderDept.split(",")) || [];
       this.updateData = data;
     },
@@ -243,7 +242,6 @@ export default {
         });
     },
     showText(index, bool) {
-      console.log(index);
       let data = this.dataList;
       data[index].focus = bool;
       this.dataList = data;

src/views/assessingTarget/commonquotatask.vue

@@ -92,7 +92,6 @@ export default {
       api
         .getList( this.page )
         .then((res) => {
-          console.log(res.data);
           this.loading = false;
           let data = res.data.data
           this.dataList = data;

src/views/assessingTarget/constraint.vue

@@ -198,7 +198,6 @@ export default {
     },
     showLeaderDept(data) {
       this.showDep = true;
-      console.log(data);
       data.leaderDept = (data.leaderDept && data.leaderDept.split(",")) || [];
       this.updateData = data;
     },
@@ -227,7 +226,6 @@ export default {
         });
     },
     showText(index, bool) {
-      console.log(index);
       let data = this.dataList;
       data[index].focus = bool;
       this.dataList = data;

src/views/assessingTarget/reward.vue

@@ -212,7 +212,6 @@ export default {
     },
     showLeaderDept(data) {
       this.showDep = true;
-      console.log(data);
       data.leaderDept = (data.leaderDept && data.leaderDept.split(",")) || [];
       this.updateData = data;
     },
@@ -241,12 +240,11 @@ export default {
         });
     },
     showText(index, bool) {
-      console.log(index);
       let data = this.dataList;
       data[index].focus = bool;
       this.dataList = data;
     },
-    getDataList(params) {
+    getDataList() {
       this.loading = true;
       api
         .getList(Object.assign({},this.type, this.searchParams, this.page))

src/views/assessingTarget/search.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="search">
-    <el-form :inline="true" :model="searchParams" size="small">
+    <el-form :inline="true" :model="searchParams" size="mini">
       <template v-if="type == 1 || type == 2">
         <el-form-item label="一级指标：">
           <el-select

src/views/basicTable/category.vue

@@ -256,7 +256,6 @@ export default {
       this.ischecked = 'add'
     },
     look(row) {
-      console.log(row);
       this.form = Object.assign({}, row)
       this.dialogTitle = '查看表'
       this.showAdd = true

src/views/basicTable/conventional.vue

@@ -203,7 +203,6 @@ export default {
         .getList(Object.assign({}, this.searchParams, this.page))
         .then((res) => {
           this.loading = false;
-          console.log(res.data.data.records);
           let data = res.data.data.records;
           data = data.map((item) => {
             item.year = item.year + "";

src/views/basicTable/search.vue

@@ -84,7 +84,6 @@ export default {
   },
   watch: {
     "searchParams.year"(val) {
-      console.log(val);
       if (!val) {
         this.$set(this.searchParams, "code", "");
         this.codeList = [];

src/views/summary/basicTarget.vue

@@ -18,31 +18,31 @@
         ></el-table-column>
          <el-table-column
             label="一级指标"
-            min-width="150"
+            min-width="80"
             align="center"
             prop="quota1"
           ></el-table-column>
           <el-table-column
             label="二级指标"
-            min-width="150"
+            min-width="120"
             align="center"
             prop="quota2"
           ></el-table-column>
         <el-table-column
           label="考核内容和计分规则"
-          min-width="80"
+          min-width="300"
           align="center"
           prop="content" 
         ></el-table-column>
         <el-table-column
           label="分值"
-          min-width="100"
+          min-width="60"
           align="center"
           prop="points"
         ></el-table-column>
         <el-table-column
           label="预计得分"
-          min-width="100"
+          min-width="60"
           align="center"
           prop="expectedPoints"
         ></el-table-column>
@@ -60,13 +60,13 @@
         ></el-table-column>
           <el-table-column
           label="责任领导"
-          min-width="100"
+          min-width="80"
           align="center"
-          prop="leaderPrincipal"
+          prop="leaderPrincipalList"
         ></el-table-column>
         <el-table-column
           label="得分说明"
-          min-width="80"
+          min-width="120"
           align="center"
           prop="note"
         ></el-table-column>
@@ -107,7 +107,8 @@ export default {
   components: {
     search,
   },
-   created() {
+  // mixins: [assessing],
+  created() {
     this.getDataList();
     this.$store.dispatch('base/getQuota1List',1)
   },
@@ -128,7 +129,6 @@ export default {
           });
           this.dataList = data;
           this.count = res.data.data.total;
-          console.log(res.data);
         })
         .catch(() => {
           this.loading=false

src/views/summary/constraint.vue

@@ -18,19 +18,19 @@
         ></el-table-column>
           <el-table-column
           label="考核指标"
-          min-width="150"
+          min-width="80"
           align="center"
           prop="quota"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分规则"
-          min-width="80"
+          min-width="400"
           align="center"
           prop="content" 
         ></el-table-column>
         <el-table-column
           label="预计扣分"
-          min-width="100"
+          min-width="50"
           align="center"
           prop="expectedPoints"
         ></el-table-column>
@@ -44,13 +44,13 @@
           label="牵头部门"
           min-width="80"
           align="center"
-          prop="leaderDept"
+          prop="leaderDeptList"
         ></el-table-column>
           <el-table-column
           label="责任领导"
           min-width="100"
           align="center"
-          prop="leaderPrincipal"
+          prop="leaderPrincipalList"
         ></el-table-column>
         <el-table-column
           label="扣分说明"
@@ -95,7 +95,7 @@ export default {
   components: {
     search,
   },
-   created() {
+  created() {
     this.getDataList();
     this.$store.dispatch('base/getQuota1List',1)
   },
@@ -116,7 +116,6 @@ export default {
           });
           this.dataList = data;
           this.count = res.data.data.total;
-          console.log(res.data);
         })
         .catch(() => {
           this.loading=false

src/views/summary/reward.vue

@@ -18,19 +18,19 @@
         ></el-table-column>
          <el-table-column
             label="一级指标"
-            min-width="150"
+            min-width="100"
             align="center"
             prop="quota1"
           ></el-table-column>
           <el-table-column
             label="二级指标"
-            min-width="150"
+            min-width="100"
             align="center"
             prop="quota2"
           ></el-table-column>
         <el-table-column
           label="考核内容和计分规则"
-          min-width="80"
+          min-width="200"
           align="center"
           prop="content" 
         ></el-table-column>
@@ -56,17 +56,17 @@
           label="牵头部门"
           min-width="80"
           align="center"
-          prop="leaderDept"
+          prop="leaderDeptList"
         ></el-table-column>
           <el-table-column
           label="责任领导"
           min-width="100"
           align="center"
-          prop="leaderPrincipal"
+          prop="leaderPrincipalList"
         ></el-table-column>
         <el-table-column
           label="得分说明"
-          min-width="80"
+          min-width="120"
           align="center"
           prop="note"
         ></el-table-column>
@@ -107,7 +107,7 @@ export default {
   components: {
     search,
   },
-   created() {
+  created() {
     this.getDataList();
     this.$store.dispatch('base/getQuota1List',1)
   },
@@ -128,7 +128,6 @@ export default {
           });
           this.dataList = data;
           this.count = res.data.data.total;
-          console.log(res.data);
         })
         .catch(() => {
           this.loading=false

src/views/system/user/index.vue

@@ -105,15 +105,13 @@
                 <el-option label="女" :value="2"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="职级" prop="levelId" :rules="{
-                    required: true, message: '所属职级不能为空', trigger: 'change'
-                  }">
+            <el-form-item label="职级" prop="levelId">
               <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-select v-model="editForm.deptId" placeholder="请选择部门" class="ele-block" clearable multiple>
                 <el-option v-for="(item,index) in departmentsList" :key="index" :label="item.name" :value="item.id"/>
               </el-select>
             </el-form-item>
@@ -129,9 +127,7 @@
             <el-form-item label="个人简介:">
               <el-input v-model="editForm.intro" placeholder="请输入个人简介" clearable/>
             </el-form-item>
-            <el-form-item label="岗位" prop="positionId" :rules="{
-                    required: true, message: '所属岗位不能为空', trigger: 'change'
-                  }">
+            <el-form-item label="岗位" prop="positionId">
               <el-select filterable clearable v-model="editForm.positionId" size="small" placeholder="-请选择岗位-">
                 <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id"/>
               </el-select>
@@ -328,7 +324,6 @@ export default {
       this.$http.get('/dept/getDeptList/1').then(res => {
         if (res.data.code === 0) {
           this.departmentsList = res.data.data;
-          console.log(this.departmentsList);
         } else {
           this.$message.error(res.data.msg);
         }