问题修改

src/components/assessment/assessmentApplicationFrom.vue

@@ -95,16 +95,17 @@
                             </el-table-column>
                             <el-table-column label="人员">
                                 <template #default="scope">
-                                    <el-select v-model="scope.row.employeeId" placeholder="请选择人员">
+                                    <!-- <el-select v-model="scope.row.employeeId" placeholder="请选择人员">
                                         <el-option
                                         v-for="item in deptLeaderOptionDet"
                                         :key="item.id"
                                         :label="item.name"
                                         :value="item.id">
-                                        <!-- <span style="float: left;display:inline-block;width:100px">{{ item.name }}</span>
-                                        <span style="float: right;color: #909399;font-size: 13px;" >{{ item.no }}</span> -->
+                                        <span style="float: left;display:inline-block;width:100px">{{ item.name }}</span>
+                                        <span style="float: right;color: #909399;font-size: 13px;" >{{ item.no }}</span>
                                         </el-option>
-                                    </el-select>
+                                    </el-select> -->
+                                    <span>{{scope.row.employeeName}}</span>
                                 </template>
                             </el-table-column>
                             <el-table-column label="建议值">
@@ -209,7 +210,7 @@ export default {
             this.activeName = 'first'
             this.getDetails(row.id)
             // this.getDetailsHeader(row.id)
-            this.changeDeptLead(row.deptId)
+            // this.changeDeptLead(row.deptId)
             this.rowMsg = row
             this.$nextTick(() =>{
                 this.receiptMsg = {
@@ -226,20 +227,6 @@ export default {
                 }
             })
         },
-        // 根据部门查询人员
-        changeDeptLead(val) {
-            let that = this
-            let params = {
-                current: 1,
-                size: 2000,
-                // orgId: val
-            }
-            apiGetuserPageList(params).then(datas =>{
-                if (datas && datas.data) {
-                    that.deptLeaderOptionDet = datas.data.records
-                }
-            })
-        },
         rowClick(selection, row) {
             this.changeDateSelect = selection
         },
@@ -306,9 +293,26 @@ export default {
         },
         employeeNoInputBlur(val, row) {
             row.employeeId = ''
-            this.deptLeaderOptionDet.forEach(it =>{
-                if (val === it.no) {
-                    row.employeeId = it.id
+            // this.deptLeaderOptionDet.forEach(it =>{
+            //     if (val === it.no) {
+            //         row.employeeId = it.id
+            //     }
+            // })
+            this.changeDeptLead(val, row)
+        },
+        // 根据部门查询人员
+        changeDeptLead(val, row) {
+            let that = this
+            let params = {
+                current: 1,
+                size: 500,
+                no: val
+            }
+            apiGetuserPageList(params).then(datas =>{
+                if (datas && datas.data) {
+                    // that.deptLeaderOptionDet = datas.data.records
+                    row.employeeName = datas.data.records[0].name
+                    row.employeeId = datas.data.records[0].id
                 }
             })
         },
@@ -319,7 +323,7 @@ export default {
                 businessPlanId: this.rowMsg.id,
                 employeeId: '',
                 employeeNo: '',
-                suggestedValue: 1,
+                suggestedValue: 1.00,
                 serialNumber: 0
             }
             this.quantifiedList.unshift(obj)
@@ -328,18 +332,18 @@ export default {
             let that = this
             let params = []
             that.quantifiedList.forEach(item =>{
-                let emName = ''
-                let emNo = ''
-                that.deptLeaderOptionDet.forEach(it =>{
-                    if (item.employeeId === it.id) {
-                        emName = it.name
-                        emNo = it.no
-                    }
-                })
+                // let emName = ''
+                // let emNo = ''
+                // that.deptLeaderOptionDet.forEach(it =>{
+                //     if (item.employeeId === it.id) {
+                //         emName = it.name
+                //         emNo = it.no
+                //     }
+                // })
                 let obj = {
                     assessmentDeclarationId: that.rowMsg.id,
                     employeeId: item.employeeId,
-                    employeeName: emName,
+                    employeeName: item.employeeName,
                     employeeNo: item.employeeNo ? item.employeeNo : emNo,
                     suggestedValue: item.suggestedValue.toFixed(2).toString(),
                     serialNumber: item.serialNumber

src/components/assessment/assessmentApplicationPage.vue

@@ -283,8 +283,8 @@ export default {
                 deptName: that.departNameS,
                 deptId: userMes.deptId,
                 // deptId: '',
-                annual: that.timeIds ? this.timeIds.substring(0, this.timeIds.indexOf('-')) : '',
-                declarationMonth: that.timeIds ? this.timeIds.substring(this.timeIds.indexOf('-')+1, this.timeIds.length)*1 : ''
+                annual: that.timeIds ? this.timeIds.substring(0, this.timeIds.indexOf('-'))*1 : null,
+                declarationMonth: that.timeIds ? this.timeIds.substring(this.timeIds.indexOf('-')+1, this.timeIds.length)*1 : null
             }
             apiGetevaluatiodeptadList(params).then(datas =>{
                 if (datas && datas.data) {

src/components/gateWay/gatewayNewSeasonFrom.vue

@@ -269,6 +269,10 @@ export default {
             {
                 label: '煤电一体化',
                 value: 'MDYTH'
+            },
+            {
+                label: '综合支持',
+                value: 'ZHZC'
             }
         ]
     },

src/components/gateWay/gatewayNewYearFrom.vue

@@ -101,6 +101,14 @@ export default {
             {
                 label: '海外业务',
                 value: 'GJYW'
+            },
+            {
+                label: '煤电一体化',
+                value: 'MDYTH'
+            },
+            {
+                label: '综合支持',
+                value: 'ZHZC'
             }
         ]
     },