部门考评配置新增修改部门领导服务，及其联调；绩效结果考核申报页面新增增加默认值；

src/components/assessment/assessmentApplicationPage.vue

@@ -480,14 +480,16 @@ export default {
         handleAdd() {
             this.dialogVisible = true
             this.title = '新建表单填报'
+            let yearStr = new Date().getFullYear()
+            let monthStr = new Date().getMonth()+1
             this.$nextTick(() =>{
                 this.$refs['ruleForm'].resetFields()
                 this.ruleForm = {
                     deptName: '',
                     deptLeaderName: '',
                     declarationLevel: '',
-                    annual: '',
-                    declarationMonth: 1,
+                    annual: yearStr.toString(),
+                    declarationMonth: monthStr,
                     declarationReason: ''
                 }
             })

src/components/evaluationSystem/evaluationDepartmentPage.vue

@@ -93,7 +93,7 @@
                                 :key="item.id"
                                 :label="item.name"
                                 :value="item.id">
-                                <span style="float: left;display:inline-block;width:100px">{{ item.name }}</span>
+                                <span style="float: left;display:inline-block;width:100px">{{ item.userName }}</span>
                                 <span style="float: right;color: #909399;font-size: 13px;" >{{ item.no }}</span>
                                 </el-option>
                             </el-select>
@@ -124,7 +124,7 @@ import seachs from '../seachGroup.vue'
 import addW from '../../assets/btnIcon/addW.png'
 import addIcon from '../../assets/btnIcon/add.png'
 import {apiGetEvaluationDeptList, apiGetevaluationdeptSave, apiGetevaluationdeptremoveAll, apiGetorganizationstructureFromTree,
-apiGetuserPageList} from '../../api/api'
+apiGetDepartmentallocationLeader} from '../../api/api'
 export default {
   components: { importDailog, btns, seachs },
     data() {
@@ -175,7 +175,6 @@ export default {
     created() {
         this.getEvalCompanyData()
         this.getDepartmentFromTreeData()
-        this.getuserPageList()
         this.indicatorCategorys = [
             {
                 label: '指标计划',
@@ -228,15 +227,19 @@ export default {
             apiGetorganizationstructureFromTree(params).then(datas =>{
                 if (datas && datas.data) {
                     that.depart2Data = datas.data[0].children
+                    that.getuserPageList(val)
                 }
             })
         },
         // 查询人员
         getuserPageList(val) {
             let that = this
-            apiGetuserPageList(val).then(datas =>{
+            let params = {
+                id: val
+            }
+            apiGetDepartmentallocationLeader(params).then(datas =>{
                 if (datas && datas.data) {
-                    that.deptLeaderOption = datas.data.records
+                    that.deptLeaderOption = datas.data
                 }
             })
         },
@@ -297,7 +300,7 @@ export default {
             })
             that.deptLeaderOption.forEach(item =>{
                 if (item.id === that.ruleForm.departmentLeader) {
-                    deptLeaderNameS = item.name
+                    deptLeaderNameS = item.userName
                 }
             })
             let yjzbjhTypeIn = '0'