部门考评配置问题测试及其修改，服务联调；

src/api/api.js

@@ -36,6 +36,28 @@ export function apiGetPrivilegesOfCurrentUserAll() {
     })
 }
 
+
+// 部门配置测试数据
+export function apievaluationdeptallocationgetDept() {
+    return httpRequest({
+      url: `evaluation-dept-allocation/getDept`,
+      method: 'get'
+    })
+}
+export function apievaluationdeptallocationgetDept2(params) {
+    return httpRequest({
+      url: `evaluation-dept-allocation/getSubdepartment/${params}`,
+      method: 'get'
+    })
+}
+export function apievaluationdeptallocationgetUser() {
+    return httpRequest({
+      url: `evaluation-dept-allocation/getUser`,
+      method: 'get'
+    })
+}
+
+
 //----------------------------------------登录页接口------------------------------------------------
 // 获取密码加密密钥
 export function apigetPublicKey() {

src/components/assessment/assessmentApplicationFrom.vue

@@ -391,6 +391,10 @@ export default {
             this.$refs.importPage.upload.url = '/evaluation-dept-ad/import'
         },
         successImport(val) {
+            that.$message({
+                type: 'success',
+                message: val.data
+            });
             this.getDetails(this.rowMsg.id)
         },
         handleExport() {

src/components/assessment/monthQuarterYearFrom.vue

@@ -102,7 +102,7 @@
                                     <el-table-column v-for="(iv, index) in it.children" :key="index" :label="iv.key"
                                      align="center" width="150" sortable :sort-method="(a,b)=>sortMethods(a,b,iv.code)">
                                         <template #default="scope">
-                                            <el-select v-model="scope.row[iv.code]" placeholder="请选择审核状态" v-if="scope.row['IS_LH_'+iv.code] === '3'">
+                                            <el-select v-model="scope.row[iv.code]" class="selectSty" placeholder="请选择审核状态" v-if="scope.row['IS_LH_'+iv.code] === '3'">
                                                 <el-option
                                                 v-for="item in statusData"
                                                 :key="item.id"
@@ -110,8 +110,8 @@
                                                 :value="item.id">
                                                 </el-option>
                                             </el-select>
-                                            <el-input v-model="scope.row[iv.code]" v-else-if="scope.row['IS_LH_'+iv.code] === '2'"></el-input>
-                                            <el-input-number v-model="scope.row[iv.code]" :precision="2" :step="0.1" v-else />
+                                            <el-input v-model="scope.row[iv.code]" class="inputSty" v-else-if="scope.row['IS_LH_'+iv.code] === '2'"></el-input>
+                                            <el-input-number v-model="scope.row[iv.code]" class="numberSty" :precision="2" :step="0.1" v-else />
                                         </template>
                                     </el-table-column>
                                 </el-table-column>
@@ -709,6 +709,15 @@ export default {
                                                     height: 45px;
                                                 }
                                             }
+                                            // .el-select{
+                                            //     .el-input{
+                                            //         .el-input__wrapper{
+                                            //             .el-input__inner{
+                                            //                 color: red;
+                                            //             }
+                                            //         }
+                                            //     }
+                                            // }
                                         }
                                     }
                                 }

src/components/evaluationSystem/evaluationDepartmentPage.vue

@@ -56,7 +56,8 @@
                 <div class="periodFrom">
                     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" :validate-on-rule-change="false">
                         <el-form-item label="一级部门" prop="department">
-                            <el-select v-model="ruleForm.department" placeholder="请选择所属部门" filterable  @change="changedepart2Data">
+                            <el-select v-model="ruleForm.department" placeholder="请选择所属部门" :disabled="isSave"
+                             filterable  @change="changedepart2Data">
                                 <el-option
                                 v-for="item in departData"
                                 :key="item.id"
@@ -66,7 +67,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="二级部门">
-                            <el-select v-model="ruleForm.depart2ment" placeholder="请选择所属部门" >
+                            <el-select v-model="ruleForm.depart2ment" placeholder="请选择所属部门" :disabled="isSave" >
                                 <el-option
                                 v-for="item in depart2Data"
                                 :key="item.id"
@@ -116,7 +117,8 @@ import seachs from '../seachGroup.vue'
 import addW from '../../assets/btnIcon/addW.png'
 import addIcon from '../../assets/btnIcon/add.png'
 import {apiGetEvaluationDeptList, apiGetevaluationdeptSave, apiGetevaluationdeptremoveAll, apiGetorganizationstructureFromTree,
-apiGetDepartmentallocationLeader} from '../../api/api'
+apiGetDepartmentallocationLeader,
+apievaluationdeptallocationgetDept,apievaluationdeptallocationgetDept2, apievaluationdeptallocationgetUser} from '../../api/api'
 export default {
   components: { importDailog, btns, seachs },
     data() {
@@ -208,6 +210,12 @@ export default {
                     that.departData = datas.data[0].children
                 }
             })
+            // 测试数据
+            // apievaluationdeptallocationgetDept().then(datas =>{
+            //     if (datas && datas.data) {
+            //         that.departData = datas.data
+            //     }
+            // })
         },
         // 二级部门
         changedepart2Data(val) {
@@ -220,9 +228,28 @@ export default {
             apiGetorganizationstructureFromTree(params).then(datas =>{
                 if (datas && datas.data) {
                     that.depart2Data = datas.data[0].children
+                        if (that.isSave) {
+                            that.ruleForm.depart2ment = ''
+                            if (that.evalradio.parentId !== '') {
+                                that.ruleForm.depart2ment = that.evalradio.deptId
+                            }
+                        }
                     that.getuserPageList(val)
                 }
             })
+            // 测试数据
+            // apievaluationdeptallocationgetDept2(val).then(datas =>{
+            //     if (datas && datas.data) {
+            //         that.depart2Data = datas.data
+            //         if (that.isSave) {
+            //             that.ruleForm.depart2ment = ''
+            //             if (that.evalradio.parentId !== '') {
+            //                 that.ruleForm.depart2ment = that.evalradio.deptId
+            //             }
+            //         }
+            //         that.getuserPageList(val)
+            //     }
+            // })
         },
         // 查询人员
         getuserPageList(val) {
@@ -232,6 +259,12 @@ export default {
                     that.deptLeaderOption = datas.data
                 }
             })
+            // 测试数据
+            // apievaluationdeptallocationgetUser().then(datas =>{
+            //     if (datas && datas.data) {
+            //         that.deptLeaderOption = datas.data
+            //     }
+            // })
         },
         handleAdd() {
             this.dialogVisible = true
@@ -265,12 +298,13 @@ export default {
             }
             if (this.evalradio.parentId !== '') {
                 this.ruleForm.department = this.evalradio.parentId
-                this.ruleForm.depart2ment = this.evalradio.deptId
                 this.changedepart2Data(this.evalradio.parentId)
+                // this.getuserPageList(this.evalradio.parentId)
             } else {
                 this.ruleForm.department = this.evalradio.deptId
+                this.changedepart2Data(this.evalradio.deptId)
+                // this.getuserPageList(this.evalradio.deptId)
             }
-            this.getuserPageList(this.evalradio.deptId)
         },
         saveevaluationDepartmentMsg(formName) {
             let that = this

src/components/taskCenter/taskApplicationFrom.vue

@@ -415,6 +415,10 @@ export default {
             this.$refs.importPage.upload.url = '/evaluation-dept-ad/import'
         },
         successImport(val) {
+            that.$message({
+                type: 'success',
+                message: val.data
+            });
             this.getDetails(this.rowMsg.id)
         },
         handleExport() {