功能性问题修改

src/api/api.js

@@ -1741,4 +1741,9 @@ export function apiGetbenchmarkingupdateData(params) {
 //生成规则
 export function apiorganizationratinggrade(params) {
     return httpRequest.post('organization-rating/grade', params)
+}
+
+//计算评级保存
+export function apiorganizationratingsaveInfo(params) {
+    return httpRequest.post('organization-rating/save-info', params)
 }

src/components/assessment/monthQuarterYearFrom.vue

@@ -355,14 +355,15 @@ export default {
         getStageData(type) {
             let that = this
             let params = {
-                type: '3'
+                type: type === '年度' ? '4' : '3'
             }
             apiGetbinstageList(params).then(datas => {
                 if (datas && datas.data) {
                     that.stageData = datas.data
                     that.activeName = datas.data[0].stageCode
-                    this.setShowCalcBtn(datas.data[0].stageCode)
+                    that.setShowCalcBtn(datas.data[0].stageCode)
                     that.getTableHeaderData(datas.data[0].id)
+                    that.addstageId = datas.data[0].id
                 }
             })
         },
@@ -411,6 +412,11 @@ export default {
                         it.showClick = true
                         this.binSectionStr = it.id
                     }
+                } else if (val.props.name === 'KJCX') {
+                    if (it.isNameEn === 'KJCX') {
+                        it.showClick = true
+                        this.binSectionStr = it.id
+                    }
                 } else {
                     if (it.isNameEn === 'HD') {
                         it.showClick = true
@@ -485,6 +491,8 @@ export default {
                 this.activeName = 'GLSX'
             } else if (data.isNameEn === 'ZDZX') {
                 this.activeName = 'ZDZX'
+            } else if (data.isNameEn === 'KJCX') {
+                this.activeName = 'KJCX'
             } else {
                 this.activeName = 'SCJY'
             }
@@ -608,6 +616,13 @@ export default {
             this.$refs.importPage.upload.title = "考评详情信息导入"
             this.$refs.importPage.upload.open = true
             this.$refs.importPage.upload.url = '/organization-evaluation-info/import-excel'
+            this.$refs.importPage.hasuploadData = true
+            this.$refs.importPage.uploadData = {
+                organizationEvaluationId: this.rowMsg.id,
+                indicatorId: this.isClickTagId,
+                binStage: this.addstageId,
+            }
+            this.$refs.importPage.binSection = this.binSectionStr
         },
         successImport(val) {
             that.getTableData(that.isClickTagId)

src/components/importPage/importDailog.vue

@@ -77,6 +77,13 @@ export default {
             binSection: "",
             year: "",
             id: "",
+            hasuploadData: false,
+            uploadData: {
+                organizationEvaluationId: '',
+                indicatorId: '',
+                binSection: '',
+                binStage: ''
+            }
         }
     },
     methods: {
@@ -133,6 +140,11 @@ export default {
             formData.append("id", this.id || "");
             formData.append("userId", userInfo.importExcelId || "");
             formData.append("userName", userInfo.importExcelName || "");
+            if (this.hasuploadData) {
+                formData.append("organizationEvaluationId", this.uploadData.organizationEvaluationId);
+                formData.append("indicatorId", this.uploadData.indicatorId);
+                formData.append("binStage", this.uploadData.binStage);
+            }
             axios.post(`${this.upload.processurl}${this.upload.url}`, formData, {
                 headers: {
                     "Content-Type": "application/octet-stream"

src/components/taskCenter/taskCenterEvlNewFrom.vue

@@ -382,13 +382,14 @@
             getStageData(type) {
                 let that = this
                 let params = {
-                    type: '3'
+                    type: type === 'nddwkplc' ? '4' : '3'
                 }
                 apiGetbinstageList(params).then(datas => {
                     if (datas && datas.data) {
                         that.stageData = datas.data
                         that.activeName = datas.data[0].stageCode
                         that.getTableHeaderData(datas.data[0].id)
+                        that.addstageId = datas.data[0].id
                     }
                 })
             },
@@ -441,6 +442,11 @@
                             it.showClick = true
                             this.binSectionStr = it.id
                         }
+                    } else if (val.props.name === 'KJCX') {
+                        if (it.isNameEn === 'KJCX') {
+                            it.showClick = true
+                            this.binSectionStr = it.id
+                        }
                     } else {
                         if (it.isNameEn === 'HD') {
                             it.showClick = true
@@ -496,6 +502,8 @@
                     this.activeName = 'GLSX'
                 } else if (data.isNameEn === 'ZDZX') {
                     this.activeName = 'ZDZX'
+                } else if (data.isNameEn === 'KJCX') {
+                    this.activeName = 'KJCX'
                 } else {
                     this.activeName = 'SCJY'
                 }
@@ -616,6 +624,13 @@
                 this.$refs.importPage.upload.title = "考评详情信息导入"
                 this.$refs.importPage.upload.open = true
                 this.$refs.importPage.upload.url = '/organization-evaluation-info/import-excel'
+                this.$refs.importPage.hasuploadData = true
+                this.$refs.importPage.uploadData = {
+                    organizationEvaluationId: this.tastbizKey,
+                    indicatorId: this.isClickTagId,
+                    binStage: this.addstageId,
+                }
+                this.$refs.importPage.binSection = this.binSectionStr
             },
             successImport(val) {
                 that.getTableData(that.isClickTagId)

src/components/taskCenter/taskUnitRatingFrom.vue

@@ -120,26 +120,30 @@
                                 <el-table-column label="生产经营评级" align="center">
                                     <el-table-column label="年度安全环保评级" width="150">
                                         <template #default="scope">
-                                            <el-input-number v-model="scope.row.safetyEnvProtection" :min="0" />
+                                            <el-input-number  v-if="userMes.deptId === '23031009'" v-model="scope.row.safetyEnvProtection" :min="0" />
+                                            <span v-else>{{scope.row.safetyEnvProtection}}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column label="否决事项" width="140">
                                         <template #default="scope">
                                             <el-select v-model="scope.row.veto" placeholder="请选择" size="large"
-                                                style="width: 100px">
+                                                style="width: 100px"  v-if="userMes.deptId === '23031009'">
                                                 <el-option v-for="item in isPgoptions" :key="item.value"
                                                     :label="item.label" :value="item.value" />
                                             </el-select>
+                                            <span v-else>{{scope.row.veto === 1 ? '是' : '否'}}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column label="净利润" width="150">
                                         <template #default="scope">
-                                            <el-input-number v-model="scope.row.netProfit" />
+                                            <el-input-number v-if="userMes.deptId === '23031009'" v-model="scope.row.netProfit" />
+                                            <span v-else>{{scope.row.netProfit}}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column label="经营业绩考核综合得分%" width="180" align="center">
                                         <template #default="scope">
-                                            <el-input-number v-model="scope.row.compositeScore" :min="0" :max="100" />
+                                            <el-input-number  v-if="userMes.deptId === '23031009'" v-model="scope.row.compositeScore" :min="0" :max="100" />
+                                            <span v-else>{{scope.row.compositeScore}}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column label="生产经营评级" prop="scjyRate" width="120" />
@@ -147,16 +151,18 @@
                                 <el-table-column label="前期评级" align="center">
                                     <el-table-column label="年度项目进度目标完成率" width="150">
                                         <template #default="scope">
-                                            <el-input-number v-model="scope.row.annualTarget" :min="0" />
+                                            <el-input-number v-if="userMes.deptId === '23031009'" v-model="scope.row.annualTarget" :min="0" />
+                                            <span v-else>{{scope.row.annualTarget}}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column label="先进性指标考核得分有无加分" width="150">
                                         <template #default="scope">
                                             <el-select v-model="scope.row.bonusPoint" placeholder="请选择" size="large"
-                                                style="width: 100px">
+                                                style="width: 100px" v-if="userMes.deptId === '23031009'">
                                                 <el-option v-for="item in isPgoptions" :key="item.value"
                                                     :label="item.label" :value="item.value" />
                                             </el-select>
+                                            <span v-else>{{scope.row.bonusPoint === 1 ? '是' : '否'}}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column label="前期评级" prop="qqRate" width="100" />
@@ -164,12 +170,14 @@
                                 <el-table-column label="基建评级" align="center">
                                     <el-table-column label="基建工程综合得分排名" width="160">
                                         <template #default="scope">
-                                            <el-input-number v-model="scope.row.compositeScoreRaking" :min="0" />
+                                            <el-input-number v-if="userMes.deptId === '23031009'" v-model="scope.row.compositeScoreRaking" :min="0" />
+                                            <span v-else>{{scope.row.compositeScoreRaking}}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column label="基建工程项目等级" width="150">
                                         <template #default="scope">
-                                            <el-input-number v-model="scope.row.projectLevel" :min="0" />
+                                            <el-input-number v-if="userMes.deptId === '23031009'" v-model="scope.row.projectLevel" :min="0" />
+                                            <span v-else>{{scope.row.projectLevel}}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column label="基建评级" prop="jjRate" width="100" />