部门考评相关的页面修改部门数据；新增单位考评评级页面并且服务联调；

src/api/api.js

@@ -578,6 +578,27 @@ export function apiGetevaluationdownloadReport(params) {
 }
 
 
+//--------单位绩效考核评级列表
+export function apiGetorganizationratinglist(params) {
+    return httpRequest({
+        url: 'organization-rating/list',
+        method: 'get',
+        params: params
+    })
+}
+//--------单位绩效考核评级列表---新增/修改
+export function apiGetorganizationratingsave(params) {
+    return httpRequest.post('organization-rating/save', params)
+}
+//----单位绩效考核评级列表---删除
+export function apiPostorganizationratingDelete(params) {
+    return httpRequest({
+        url: `organization-rating/remove/${params}`,
+        method: 'post'
+    })
+}
+
+
 
 //--------部门绩效考核评级列表
 export function apiGetevaluationdeptratinglist(params) {
@@ -1030,4 +1051,26 @@ export function apiPostevaluationwarningruleDelete(params) {
 
 
 
+//----考评评级规则列表查询-list
+export function apiGetorganizationRatingruleList(params) {
+    return httpRequest({
+        url: 'organization-rating-rule/list',
+        method: 'get',
+        params: params
+    })
+}
+//----"考评评级规则-保存/修改"
+export function apiGetorganizationratingruleSave(params) {
+    return httpRequest.post('organization-rating-rule/save', params)
+}
+//----"考评评级规则删除"
+export function apiGetorganizationratingruleRemove(params) {
+    return httpRequest({
+        url: `organization-rating-rule/remove/${params}`,
+        method: 'post'
+    })
+}
+
+
+
 //----------------------------------------基础信息配置------------------------------------------------

src/components/assessment/evaluationDeptRatingPage.vue

@@ -61,6 +61,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column label="A级总数" prop="acount" />
+                    <el-table-column label="C级总数" prop="ccount" />
                 </el-table>
                 <!-- <el-pagination
                     @size-change="handleSizeChange"
@@ -79,7 +80,7 @@
                                 <el-option
                                 v-for="item in departData"
                                 :key="item.id"
-                                :label="item.keyName"
+                                :label="item.name"
                                 :value="item.id">
                                 </el-option>
                             </el-select>
@@ -147,7 +148,7 @@ import seachs from '../seachGroup.vue'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
 import {apiGetevaluationdeptratinglist, apiGetevaluationdeptratingsave,
-apiGetdatadictionaryList, apiPostevaluationdeptratingDelete} from '../../api/api'
+apiGetorganizationstructureFromTree, apiPostevaluationdeptratingDelete} from '../../api/api'
 export default {
     components: {
         startFromList,
@@ -343,11 +344,13 @@ export default {
         getDepartmentFromTreeData() {
             let that = this
             let params = {
-                superKey: 'BM0001'
+                id: '23031001',
+                num: 1,
+                type: 140
             }
-            apiGetdatadictionaryList(params).then(datas =>{
+            apiGetorganizationstructureFromTree(params).then(datas =>{
                 if (datas && datas.data) {
-                    that.departData = datas.data
+                    that.departData = datas.data[0].children
                 }
             })
         },
@@ -395,7 +398,7 @@ export default {
             let orgName = ''
             this.departData.forEach(item =>{
                 if (item.id === that.ruleForm.department) {
-                    orgName = item.keyName
+                    orgName = item.name
                 }
             })
             let userMes = JSON.parse(window.sessionStorage.getItem('user'))
@@ -626,6 +629,7 @@ export default {
                 { header: '十二月', key: 'dece', width: 15 },
                 { header: '十二月通告', key: 'deceContent', width: 26 },
                 { header: 'A级总数', key: 'acount', width: 15 },
+                { header: 'C级总数', key: 'ccount', width: 15 },
             ]
             worksheet.columns = colums
             worksheet.getRow(1).font = {

src/components/assessment/evaluationDeptStartPage.vue

@@ -84,7 +84,7 @@
                                 <el-option
                                 v-for="item in departData"
                                 :key="item.id"
-                                :label="item.keyName"
+                                :label="item.name"
                                 :value="item.id">
                                 </el-option>
                             </el-select>
@@ -154,7 +154,7 @@
 import startFromList from './evaluationDeptStartFrom.vue'
 import btns from '../elbuttonS.vue'
 import seachs from '../seachGroup.vue'
-import {apiGetevaluatiodeptplanList, apiGetevaluationdeptplanSave,apiGetdoAction,
+import {apiGetevaluatiodeptplanList, apiGetevaluationdeptplanSave,apiGetdoAction,apiGetorganizationstructureFromTree,
 apiGetworkflowgetOpinion,apiGetevaluationdeptplanModify,apiGetevaluationdeptplanReport,apiGetevaluationdownloadReport,
 apideptModifyState, apiGetdatadictionaryList, apiPostevaluationdeptplanDelete} from '../../api/api'
 export default {
@@ -251,11 +251,13 @@ export default {
         getDepartmentFromTreeData() {
             let that = this
             let params = {
-                superKey: 'BM0001'
+                id: '23031001',
+                num: 1,
+                type: 140
             }
-            apiGetdatadictionaryList(params).then(datas =>{
+            apiGetorganizationstructureFromTree(params).then(datas =>{
                 if (datas && datas.data) {
-                    that.departData = datas.data
+                    that.departData = datas.data[0].children
                 }
             })
         },
@@ -309,9 +311,9 @@ export default {
                 that.departData.forEach(itv =>{
                     if (itv.id === it) {
                         let obj = {
-                            dataKey: itv.dataKey,
+                            // dataKey: itv.dataKey,
                             id: itv.id,
-                            keyName: itv.keyName
+                            keyName: itv.name
                         }
                         deptData.push(obj)
                     }

src/components/assessment/evaluationUnitRatingPage.vue

@@ -1,10 +1,21 @@
 <template>
-    <div class="evaluationRating">
-        <div class="evaluationRatingBtn">
+    <div class="evaluationUnitRating">
+        <div class="evaluationUnitRatingBtn">
             <div class="collectSeach">
                 <div class="exceed">
-                    <span class="exceedSpan">部门名称：</span>
-                    <el-input v-model="resDeptName" placeholder="请输入部门名称"></el-input>
+                    <span class="exceedSpan">单位名称：</span>
+                    <el-input v-model="resCompanyName" placeholder="请输入单位名称"></el-input>
+                </div>
+                <div class="exceed">
+                    <span class="exceedSpan">业务属性：</span>
+                    <el-select v-model="businessStr" placeholder="请选择业务属性" clearable >
+                        <el-option
+                        v-for="item in binSectionoptions"
+                        :key="item.sectionCode"
+                        :label="item.sectionName"
+                        :value="item.sectionCode">
+                        </el-option>
+                    </el-select>
                 </div>
                 <div class="exceed">
                     <span class="exceedSpan" style="width: 80px">考评年度：</span>
@@ -30,57 +41,52 @@
                 @handleExport="handleExport"
                 ></btns>
             </div>
-            <div class="evaluationRatingTableData">
-                <!-- .length>0?evaluationRatingData.slice((page.currentPage-1)*page.pagesize, page.currentPage*page.pagesize):evaluationRatingData -->
-                <el-table :data="evaluationRatingData" style="width: 100%" @select="rowClick" @select-all="rowClick">
+            <div class="evaluationUnitRatingTableData">
+                 <!-- @row-click="rowClickToggle" -->
+                <el-table :data="evaluationUnitRatingData" style="width: 100%" ref="tableSS"
+                 @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column type="index" label="序号" align="center"></el-table-column>
-                    <el-table-column label="考评部门" width="200">
-                        <template #default="scope">
-                            <el-tooltip
-                                class="box-item"
-                                effect="customized"
-                                :content="scope.row.deptName"
-                                placement="right"
-                            >
-                                <span class="tooltipCC">{{scope.row.deptName}}</span>
-                            </el-tooltip>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="考评年度" prop="annual" />
-                    <el-table-column :label="it.label" :prop="it.value" v-for="it in monthArr" :key="it.value">
+                    <el-table-column label="考评单位" width="200">
                         <template #default="scope">
                             <el-tooltip
                                 class="box-item"
                                 effect="customized"
-                                :content="scope.row[it.value+'Content']"
+                                :content="scope.row.organizationShortName"
                                 placement="right"
                             >
-                                <span class="tooltipCCDes">{{scope.row[it.value]}}</span>
+                                <span class="tooltipCC">{{scope.row.organizationShortName}}</span>
                             </el-tooltip>
                         </template>
                     </el-table-column>
-                    <el-table-column label="A级总数" prop="acount" />
+                    <el-table-column label="业务板块" prop="binSectionName" />
+                    <el-table-column label="考评年度" prop="year" />
+                    <el-table-column label="生成经营评级" prop="scjyRate" />
+                    <el-table-column label="前期评级" prop="qqRate" />
+                    <el-table-column label="基建评级" prop="jjRate" />
+                    <el-table-column label="年度评级" prop="yearRate" />
                 </el-table>
-                <!-- <el-pagination
-                    @size-change="handleSizeChange"
-                    @current-change="handleCurrentChange"
-                    :current-page="page.currentPage"
-                    :page-size="page.pagesize"
-                    layout="total, prev, pager, next, jumper"
-                    :total="page.total">
-                </el-pagination> -->
             </div>
             <el-dialog :title="title" custom-class="startToDia" v-model="dialogVisible" width="600px" :close-on-click-modal="false">
                 <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="请选择考评部门" :disabled="isSave">
+                        <el-form-item label="考评单位" prop="companyRuleF">
+                            <el-select v-model="ruleForm.companyRuleF" placeholder="请选择考评单位" :disabled="isSave">
                                 <el-option
-                                v-for="item in departData"
-                                :key="item.id"
-                                :label="item.keyName"
-                                :value="item.id">
+                                v-for="item in companyData"
+                                :key="item.organizationId"
+                                :label="item.organizationShortName"
+                                :value="item.organizationId">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="业务属性" prop="binSection">
+                            <el-select v-model="ruleForm.binSection" placeholder="请选择业务属性">
+                                <el-option
+                                v-for="item in binSectionoptions"
+                                :key="item.sectionCode"
+                                :label="item.sectionName"
+                                :value="item.sectionCode">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -93,36 +99,48 @@
                                 placeholder="请选择年份"
                                 />
                         </el-form-item>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item :label="it.label" :prop="it.value" v-for="it in monthArrLeft" :key="it.value">
-                                    <el-select v-model="ruleForm[it.value]" placeholder="请选择评级" 
-                                    clearable @change="(val)=>changeAData(val, it)" @clear="(val)=>clearAData(val, it)">
-                                        <el-option
-                                        v-for="item in ratingArr"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                        </el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item :label="it.label" :prop="it.value" v-for="it in monthArrRight" :key="it.value">
-                                    <el-select v-model="ruleForm[it.value]" placeholder="请选择评级"
-                                    clearable @change="(val)=>changeAData(val, it)" @clear="(val)=>clearAData(val, it)">
-                                        <el-option
-                                        v-for="item in ratingArr"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                        </el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-form-item :label="it.label+'通告'" :prop="it.value+'Content'" v-for="it in acauseDataArr" :key="it.value">
-                            <el-input v-model="ruleForm[it.value+'Content']" placeholder="请输入通告"></el-input>
+                        <el-form-item label="生成经营评级">
+                            <el-select v-model="ruleForm.scjyRate" placeholder="请选择评级">
+                                <el-option
+                                v-for="item in ratingArr"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="前期评级">
+                            <el-select v-model="ruleForm.qqRate" placeholder="请选择评级">
+                                <el-option
+                                v-for="item in ratingArr"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="基建评级">
+                            <el-select v-model="ruleForm.jjRate" placeholder="请选择评级">
+                                <el-option
+                                v-for="item in ratingArr"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="年度评级">
+                            <el-select v-model="ruleForm.yearRate" placeholder="请选择评级">
+                                <el-option
+                                v-for="item in ratingArr"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="描述" prop="remark">
+                            <el-input v-model="ruleForm.remark" :rows="5" type="textarea" placeholder="请输入描述"></el-input>
                         </el-form-item>
                     </el-form>
                 </div>
@@ -146,8 +164,8 @@ import btns from '../elbuttonS.vue'
 import seachs from '../seachGroup.vue'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
-import {apiGetevaluationdeptratinglist, apiGetevaluationdeptratingsave,
-apiGetdatadictionaryList, apiPostevaluationdeptratingDelete} from '../../api/api'
+import {apiGetorganizationratinglist, apiGetorganizationratingsave,apiGetOrganizationListAll,apiGetbinsectionList,
+apiPostorganizationratingDelete} from '../../api/api'
 export default {
     components: {
         startFromList,
@@ -162,148 +180,38 @@ export default {
             title: '',
             evalradio: {},
             changeDateSelect: [],
-            evaluationRatingData:[],
-            departData: [],
-            page:{
-                pagesize: 12,
-                currentPage: 1,
-                total: 0
-            },
+            evaluationUnitRatingData:[],
+            companyData: [],
+            binSectionoptions: [],
             ruleForm: {
-                department: '',
+                companyRuleF: '',
                 year: '',
-                jan: '',
-                feb: '',
-                mar: '',
-                apr: '',
-                may: '',
-                jun: '',
-                jul: '',
-                aug: '',
-                sep: '',
-                oct: '',
-                nov: '',
-                dece: '',
-                janContent: '',
-                febContent: '',
-                marContent: '',
-                aprContent: '',
-                mayContent: '',
-                junContent: '',
-                julContent: '',
-                augContent: '',
-                sepContent: '',
-                octContent: '',
-                novContent: '',
-                deceContent: ''
+                binSection: '',
+                scjyRate: '',
+                qqRate: '',
+                jjRate: '',
+                yearRate: '',
+                remark: ''
             },
             rules: {
-                department: [
-                    { required: true, message: '请选择考评部门', trigger: 'change' }
+                companyRuleF: [
+                    { required: true, message: '请选择考评单位', trigger: 'change' }
+                ],
+                binSection: [
+                    { required: true, message: '请选择考评单位', trigger: 'change' }
                 ],
                 year: [
                     { required: true, message: '请选择年份', trigger: 'change' }
-                ],
-                janContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
-                ],
-                febContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
-                ],
-                marContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
-                ],
-                aprContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
-                ],
-                mayContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
-                ],
-                junContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
-                ],
-                julContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
-                ],
-                augContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
-                ],
-                sepContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
-                ],
-                octContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
-                ],
-                novContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
-                ],
-                deceContent: [
-                    { required: true, message: '请输入通告', trigger: 'blur' }
                 ]
             },
-            resDeptName: '',
+            resCompanyName: '',
+            businessStr: '',
             resAnnual: '',
             monthArr: [],
-            monthArrLeft: [],
-            monthArrRight: [],
-            ratingArr: [],
-            acauseDataArr: []
+            ratingArr: []
         }
     },
     created() {
-        this.monthArrLeft = [
-            {
-                label: '一月',
-                value: 'jan',
-            },
-            {
-                label: '二月',
-                value: 'feb',
-            },
-            {
-                label: '三月',
-                value: 'mar',
-            },
-            {
-                label: '四月',
-                value: 'apr',
-            },
-            {
-                label: '五月',
-                value: 'may',
-            },
-            {
-                label: '六月',
-                value: 'jun',
-            }
-        ]
-        this.monthArrRight = [
-            {
-                label: '七月',
-                value: 'jul',
-            },
-            {
-                label: '八月',
-                value: 'aug',
-            },
-            {
-                label: '九月',
-                value: 'sep',
-            },
-            {
-                label: '十月',
-                value: 'oct',
-            },
-            {
-                label: '十一月',
-                value: 'nov',
-            },
-            {
-                label: '十二月',
-                value: 'dece',
-            },
-        ]
-        this.monthArr = this.monthArrLeft.concat(this.monthArrRight)
         this.ratingArr = [
             {
                 label: 'A级',
@@ -320,64 +228,48 @@ export default {
         ]
         this.resAnnual = new Date().getFullYear().toString()
         this.getevaluRatingList()
-        this.getDepartmentFromTreeData()
+        this.getOrganizetionData()
+        this.getDataDictionary()
     },
     methods:{
         // 查询列表页面
         getevaluRatingList() {
             let that = this
             let params = {
-                pageNum: that.page.currentPage,
-                pageSize: that.page.pagesize,
-                deptName: that.resDeptName,
-                annual: that.resAnnual
+                pageNum: 1,
+                pageSize: 500,
+                organizationId: that.resCompanyName,
+                binSection: that.businessStr,
+                year: that.resAnnual
             }
-            apiGetevaluationdeptratinglist(params).then(datas =>{
-                if (datas && datas.data) {
-                    that.evaluationRatingData = datas.data
-                    // that.page.total = datas.data.length
+            apiGetorganizationratinglist(params).then(datas =>{
+                if (datas && datas.data.records) {
+                    that.evaluationUnitRatingData = datas.data.records
                 }
             })
         },
-        // 查询部门
-        getDepartmentFromTreeData() {
+        //查询单位数据
+        getOrganizetionData() {
             let that = this
             let params = {
-                superKey: 'BM0001'
+                evaluationCycle: 'NDKP',
+                organizationType: 'DWKP'
             }
-            apiGetdatadictionaryList(params).then(datas =>{
+            apiGetOrganizationListAll(params).then(datas => {
                 if (datas && datas.data) {
-                    that.departData = datas.data
+                    that.companyData = datas.data
                 }
             })
         },
-        evaluationRatingFn() {
-            if (this.evaluationRatingData.length>0) {
-                evaluationRatingData.slice((page.currentPage-1)*page.pagesize, page.currentPage*page.pagesize)
-            }
-        },
-        changeAData(val, data) {
-            if (val !== '') {
-                this.monthArr.forEach(it =>{
-                    if (data.label === it.label) {
-                        let model = false
-                        this.acauseDataArr.forEach((iv, index) =>{
-                            if (data.label === iv.label) {
-                                model = true
-                            }
-                        })
-                        if (!model) {
-                            this.acauseDataArr.push(it)
-                        }
-                    }
-    
-                })
+        // 查询属性和阶段
+        getDataDictionary() {
+            let that = this
+            let params = {
+                type: '1'
             }
-        },
-        clearAData(val, data) {
-            this.acauseDataArr.forEach((it, index) =>{
-                if (data.label === it.label) {
-                    this.acauseDataArr.splice(index, 1)
+            apiGetbinsectionList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.binSectionoptions = datas.data
                 }
             })
         },
@@ -393,47 +285,26 @@ export default {
         saveAndEditIndicatorData() {
             let that = this
             let orgName = ''
-            this.departData.forEach(item =>{
-                if (item.id === that.ruleForm.department) {
-                    orgName = item.keyName
+            this.companyData.forEach(item =>{
+                if (item.organizationId === that.ruleForm.companyRuleF) {
+                    orgName = item.organizationShortName
                 }
             })
-            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             let params = {
-                deptId: that.ruleForm.department,
-                deptName: orgName,
-                annual: that.ruleForm.year,
-                jan: that.ruleForm.jan,
-                feb: that.ruleForm.feb,
-                mar: that.ruleForm.mar,
-                apr: that.ruleForm.apr,
-                may: that.ruleForm.may,
-                jun: that.ruleForm.jun,
-                jul: that.ruleForm.jul,
-                aug: that.ruleForm.aug,
-                sep: that.ruleForm.sep,
-                oct: that.ruleForm.oct,
-                nov: that.ruleForm.nov,
-                dece: that.ruleForm.dece,
-                janContent: that.ruleForm.janContent,
-                febContent: that.ruleForm.febContent,
-                marContent: that.ruleForm.marContent,
-                aprContent: that.ruleForm.aprContent,
-                mayContent: that.ruleForm.mayContent,
-                junContent: that.ruleForm.junContent,
-                julContent: that.ruleForm.julContent,
-                augContent: that.ruleForm.augContent,
-                sepContent: that.ruleForm.sepContent,
-                octContent: that.ruleForm.octContent,
-                novContent: that.ruleForm.novContent,
-                deceContent: that.ruleForm.deceContent,
-                createBy: userMes.id,
-                createName: userMes.name
+                organizationId: that.ruleForm.companyRuleF,
+                organizationShortName: orgName,
+                year: that.ruleForm.year,
+                binSection: that.ruleForm.binSection,
+                scjyRate: that.ruleForm.scjyRate,
+                qqRate: that.ruleForm.qqRate,
+                jjRate: that.ruleForm.jjRate,
+                yearRate: that.ruleForm.yearRate,
+                remark: that.ruleForm.remark
             }
             if (that.isSave) {
                 params.id = that.evalradio.id
             }
-            apiGetevaluationdeptratingsave(params).then(datas =>{
+            apiGetorganizationratingsave(params).then(datas =>{
                 if (!datas.success) {
                     that.$message({
                         message: datas.message,
@@ -442,12 +313,12 @@ export default {
                 } else {
                     if (!that.isSave) {
                         that.$message({
-                            message: '部门绩效考核评级新增成功',
+                            message: '单位绩效考核评级新增成功',
                             type: 'success'
                         });
                     } else {
                         that.$message({
-                            message: '部门绩效考核评级修改成功',
+                            message: '单位绩效考核评级修改成功',
                             type: 'success'
                         });
                     }
@@ -458,108 +329,52 @@ export default {
             })
         },
         getSeachData() {
-            this.page.currentPage = 1
             this.getevaluRatingList()
         },
         resetSeach() {
-            this.page.currentPage = 1
-            this.resDeptName = ''
+            this.resCompanyName = ''
+            this.businessStr = ''
             this.resAnnual = ''
             this.getevaluRatingList()
         },
-        handleSizeChange(val){
-            this.page.pagesize = val
-            this.getevaluRatingList()
-        },
-        handleCurrentChange(val){
-            this.page.currentPage =val
-            this.getevaluRatingList()
-        },
         rowClick(selection, row) {
             this.changeDateSelect = selection
         },
+        // rowClickToggle(row) {
+        //     this.$refs.tableSS.toggleRowSelection(row)
+        // },
         handleAdd() {
             this.dialogVisible = true
             this.isSave = false
-            this.title = '新建部门绩效考核评级'
-            this.acauseDataArr = []
+            this.title = '新建单位绩效考核评级'
             this.$nextTick(() =>{
-                // this.$refs['ruleForm'].resetFields()
                 this.ruleForm = {
-                    department: '',
+                    companyRuleF: '',
                     year: '',
-                    jan: '',
-                    feb: '',
-                    mar: '',
-                    apr: '',
-                    may: '',
-                    jun: '',
-                    jul: '',
-                    aug: '',
-                    sep: '',
-                    oct: '',
-                    nov: '',
-                    dece: '',
-                    janContent: '',
-                    febContent: '',
-                    marContent: '',
-                    aprContent: '',
-                    mayContent: '',
-                    junContent: '',
-                    julContent: '',
-                    augContent: '',
-                    sepContent: '',
-                    octContent: '',
-                    novContent: '',
-                    deceContent: ''
+                    binSection: '',
+                    scjyRate: '',
+                    qqRate: '',
+                    jjRate: '',
+                    yearRate: '',
+                    remark: ''
                 }
             })
         },
         handleEdit() {
             this.dialogVisible = true
             this.isSave = true
-            this.title = '修改部门绩效考核评级'
+            this.title = '修改单位绩效考核评级'
             this.evalradio = this.changeDateSelect[0]
-            this.acauseDataArr = []
             this.ruleForm = {
-                department: this.evalradio.deptId,
-                year: this.evalradio.annual,
-                jan: this.evalradio.jan,
-                feb: this.evalradio.feb,
-                mar: this.evalradio.mar,
-                apr: this.evalradio.apr,
-                may: this.evalradio.may,
-                jun: this.evalradio.jun,
-                jul: this.evalradio.jul,
-                aug: this.evalradio.aug,
-                sep: this.evalradio.sep,
-                oct: this.evalradio.oct,
-                nov: this.evalradio.nov,
-                dece: this.evalradio.dece,
-                janContent: this.evalradio.janContent,
-                febContent: this.evalradio.febContent,
-                marContent: this.evalradio.marContent,
-                aprContent: this.evalradio.aprContent,
-                mayContent: this.evalradio.mayContent,
-                junContent: this.evalradio.junContent,
-                julContent: this.evalradio.julContent,
-                augContent: this.evalradio.augContent,
-                sepContent: this.evalradio.sepContent,
-                octContent: this.evalradio.octContent,
-                novContent: this.evalradio.novContent,
-                deceContent: this.evalradio.deceContent
+                companyRuleF: this.evalradio.organizationId,
+                year: this.evalradio.year,
+                binSection: this.evalradio.binSection,
+                scjyRate: this.evalradio.scjyRate,
+                qqRate: this.evalradio.qqRate,
+                jjRate: this.evalradio.jjRate,
+                yearRate: this.evalradio.yearRate,
+                remark: this.evalradio.remark
             }
-            let arr = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dece']
-            arr.forEach(it =>{
-                if (this.evalradio[it] !== '') {
-                    this.monthArr.forEach(itv =>{
-                        if (itv.value === it) {
-                            this.acauseDataArr.push(itv)
-                        }
-        
-                    })
-                }
-            })
         },
         //删除
         handleDelete() {
@@ -573,7 +388,7 @@ export default {
                 that.changeDateSelect.forEach(it =>{
                     paramsArr.push(it.id)
                 })
-                apiPostevaluationdeptratingDelete(paramsArr.join(',')).then(datas =>{
+                apiPostorganizationratingDelete(paramsArr.join(',')).then(datas =>{
                     that.$message({
                         type: 'success',
                         message: '删除成功!'
@@ -584,7 +399,7 @@ export default {
             })
         },  
         handleImport() {
-            this.$refs.importPage.upload.title = "部门考评评级"
+            this.$refs.importPage.upload.title = "单位考评评级"
             this.$refs.importPage.upload.open = true
             this.$refs.importPage.upload.url = '/evaluation-dept-rating/import'
         },
@@ -592,40 +407,20 @@ export default {
             this.getevaluRatingList()
         },
         handleExport() {
-            let data = this.evaluationRatingData  //接口返回数据
+            let data = this.evaluationUnitRatingData  //接口返回数据
             const workbook = new ExcelJS.Workbook()
             const worksheet = workbook.addWorksheet('Sheet1')
             //根据数据自己调整
             let colums = []
             colums = [
                 { header: 'ID', key: 'id', width: 26 },
-                { header: '考评部门', key: 'deptName', width: 26 },
-                { header: '考评年度', key: 'annual', width: 26 },
-                { header: '一月', key: 'jan', width: 15 },
-                { header: '一月通告', key: 'janContent', width: 26 },
-                { header: '二月', key: 'feb', width: 15 },
-                { header: '二月通告', key: 'febContent', width: 26 },
-                { header: '三月', key: 'mar', width: 15 },
-                { header: '三月通告', key: 'marContent', width: 26 },
-                { header: '四月', key: 'apr', width: 15 },
-                { header: '四月通告', key: 'aprContent', width: 26 },
-                { header: '五月', key: 'may', width: 15 },
-                { header: '五月通告', key: 'mayContent', width: 26 },
-                { header: '六月', key: 'jun', width: 15 },
-                { header: '六月通告', key: 'junContent', width: 26 },
-                { header: '七月', key: 'jul', width: 15 },
-                { header: '七月通告', key: 'julContent', width: 26 },
-                { header: '八月', key: 'aug', width: 15 },
-                { header: '八月通告', key: 'augContent', width: 26 },
-                { header: '九月', key: 'sep', width: 15 },
-                { header: '九月通告', key: 'sepContent', width: 26 },
-                { header: '十月', key: 'oct', width: 15 },
-                { header: '十月通告', key: 'octContent', width: 26 },
-                { header: '十一月', key: 'nov', width: 15 },
-                { header: '十一月通告', key: 'novContent', width: 26 },
-                { header: '十二月', key: 'dece', width: 15 },
-                { header: '十二月通告', key: 'deceContent', width: 26 },
-                { header: 'A级总数', key: 'acount', width: 15 },
+                { header: '考评单位', key: 'organizationShortName', width: 26 },
+                { header: '业务板块', key: 'binSectionName', width: 26 },
+                { header: '考评年度', key: 'year', width: 26 },
+                { header: '生成经营评级', key: 'scjyRate', width: 26 },
+                { header: '前期评级', key: 'qqRate', width: 26 },
+                { header: '基建评级', key: 'jjRate', width: 26 },
+                { header: '年度评级', key: 'yearRate', width: 26 },
             ]
             worksheet.columns = colums
             worksheet.getRow(1).font = {
@@ -637,7 +432,7 @@ export default {
             workbook.xlsx.writeBuffer().then(buffer => {
                 //这里为type
                 const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8' })
-                fileSave(blob, `部门考评评级数据导出.xlsx`)
+                fileSave(blob, `单位考评评级数据导出.xlsx`)
             })
         }
     }
@@ -645,8 +440,8 @@ export default {
 </script>
 
 <style lang="less">
-.evaluationRating{
-    .evaluationRatingBtn{
+.evaluationUnitRating{
+    .evaluationUnitRatingBtn{
         .collectSeach{
             display: flex;
             padding: 24px 20px;
@@ -705,7 +500,7 @@ export default {
                 margin:0;
             }
         }
-        .evaluationRatingTableData{
+        .evaluationUnitRatingTableData{
             .el-table{
                 .el-table__body-wrapper{
                     height: 65vh !important;

src/components/assessment/monthQuarterFrom.vue

@@ -595,7 +595,7 @@ export default {
             //根据数据自己调整
             let colums = []
             colums = [
-                { header: 'ID', key: 'id', width: 26 },
+                { header: 'ID', key: 'id', width: 26, hidden: true },
                 { header: '单位名称', key: 'organizationShortName', width: 26 },
                 { header: '指标分类', key: 'typeName', width: 18 },
                 { header: '业务阶段', key: 'stageName', width: 18 },
@@ -606,7 +606,7 @@ export default {
             ]
             if (this.activeName === 'first') {
                 colums.push(
-                    { header: '目标值', key: 'quantifiedValue', width: 18 },
+                    { header: '值', key: 'quantifiedValue', width: 18 },
                     { header: '单位', key: 'unit', width: 18 },
                     { header: '审核状态', key: 'state', width: 18 }
                 )

src/components/evaluationknowledgePage/evalRatingRulesPage.vue

@@ -1,8 +1,12 @@
 <template>
-    <div class="earlyWarningRules" v-loading="loadingImport">
-        <div class="earlyWarningRulesBtn">
+    <div class="evalratingRules" v-loading="loadingImport">
+        <div class="evalratingRulesBtn">
             <div class="collectSeach">
                 <div class="exceed">
+                    <span class="exceedSpan" style="width:100px">评级名称：</span>
+                    <el-input v-model="indicatorStr" placeholder="请输入评级名称"></el-input>
+                </div>
+                <div class="exceed">
                     <span class="exceedSpan">业务属性：</span>
                     <el-select v-model="businessStr" placeholder="请选择业务属性" clearable >
                         <el-option
@@ -14,13 +18,20 @@
                     </el-select>
                 </div>
                 <div class="exceed">
-                    <span class="exceedSpan" style="width:100px">预警名称：</span>
-                    <el-input v-model="indicatorStr" placeholder="请输入预警名称"></el-input>
+                    <span class="exceedSpan">业务阶段：</span>
+                    <el-select v-model="stageStr" placeholder="请选择业务阶段" clearable >
+                        <el-option
+                        v-for="item in stageData"
+                        :key="item.id"
+                        :label="item.stageName"
+                        :value="item.id">
+                        </el-option>
+                    </el-select>
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="reset"></seachs>
             </div>
             <div class="PeriodBtn">
-                <!-- $utils.havePurview('earlyWarningRules:oneLevel:add') -->
+                <!-- $utils.havePurview('evalratingRules:oneLevel:add') -->
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -30,20 +41,20 @@
                 @handleAdd="handleAdd"
                 ></btns>
             </div>
-            <div class="earlyWarningRulesTableData">
-                <el-table :data="earlyWarningRulesData" style="width: 100%" @row-dblclick="handleEdit">
+            <div class="evalratingRulesTableData">
+                <el-table :data="evalratingRulesData" style="width: 100%" @row-dblclick="handleEdit">
                     <el-table-column label="序号" type="index" align="center" />
-                    <el-table-column label="预警名称" prop="ruleName" />
-                    <el-table-column label="业务属性" prop="sectionName"  width="200" />
-                    <el-table-column label="指标名称" prop="indicatorName" />
-                    <el-table-column label="预警类型" prop="type">
+                    <el-table-column label="评级名称" prop="ruleName" />
+                    <el-table-column label="业务属性" prop="binSectionName"  width="200" />
+                    <el-table-column label="业务阶段" prop="binStageName"  width="200" />
+                    <el-table-column label="评级类型" prop="type">
                         <template #default="scope">
                             <span v-if="scope.row.type === 'YDKP'" style="font-size: 12px;">月度考评</span>
                             <span v-else-if="scope.row.type === 'JDKP'" style="font-size: 12px;">季度考评</span>
                             <span v-else style="font-size: 12px;">年度考评</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="预警公式" prop="expression" />
+                    <el-table-column label="评级公式" prop="expression" />
                     <el-table-column label="描述">
                         <template #default="scope">
                             <el-tooltip
@@ -74,13 +85,14 @@
             <el-dialog :title="title" v-model="dialogVisible" width="60vw" :close-on-click-modal="false">
                 <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="ruleName">
-                            <el-input v-model="ruleForm.ruleName" placeholder="请输入预警名称"></el-input>
+                        <el-form-item label="评级名称" prop="ruleName">
+                            <el-input v-model="ruleForm.ruleName" placeholder="请输入评级名称"></el-input>
                         </el-form-item>
                         <el-row>
                             <el-col :span="12">
                                 <el-form-item label="业务属性" prop="binSection">
-                                    <el-select v-model="ruleForm.binSection" placeholder="请选择业务属性" :disabled="isSave" @change="changeBinstation">
+                                    <el-select v-model="ruleForm.binSection" placeholder="请选择业务属性" :disabled="isSave"
+                                     @change="changeBinstation">
                                         <el-option
                                         v-for="item in binSectionoptions"
                                         :key="item.id"
@@ -91,37 +103,20 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="指标名称" prop="indicatorId">
-                                    <!-- multiple collapse-tags -->
-                                    <el-select v-model="ruleForm.indicatorId" placeholder="请选择指标名称"
-                                    @change="changeIndication"
-                                     :disabled="isSave">
-                                        <el-option
-                                        v-for="item in indicItemoptions"
-                                        :key="item.id"
-                                        :label="item.indicatorName"
-                                        :value="item.id">
-                                        </el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="预警等级" prop="warningLevel">
-                                    <el-select v-model="ruleForm.warningLevel" placeholder="请选择预警等级">
-                                        <el-option
-                                        v-for="item in warningLeveloptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
+                                <el-form-item label="业务阶段" prop="binStage">
+                                    <el-select v-model="ruleForm.binStage" placeholder="请选择业务阶段"
+                                    @change="changeBinstation">
+                                        <el-option v-for="item in stageData" :key="item.id" :label="item.stageName"
+                                            :value="item.id">
                                         </el-option>
                                     </el-select>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="预警类型" prop="warningType">
-                                    <el-select v-model="ruleForm.warningType" placeholder="请选择预警类型">
+                                <el-form-item label="评级类型" prop="checkCycle">
+                                    <el-select v-model="ruleForm.checkCycle" placeholder="请选择评级类型" disabled>
                                         <el-option
-                                        v-for="item in warningTypeoptions"
+                                        v-for="item in checkCycleoptions"
                                         :key="item.value"
                                         :label="item.label"
                                         :value="item.value">
@@ -148,9 +143,9 @@
                                                 trigger="hover"
                                             >
                                             <div>
-                                                <p>预警类型为年度：表示每年的今天执行;</p>
-                                                <p>预警类型为季度：1,4,7,10月份表示每个季度的第一个月执行,2,5,8,11月份表示每个季度的第二个月执行,3,6,9,12月份表示每个季度的第三个月执行;</p>
-                                                <p>预警类型为月度：表示每个月的今天执.</p>
+                                                <p>评级类型为年度：表示每年的今天执行;</p>
+                                                <p>评级类型为季度：1,4,7,10月份表示每个季度的第一个月执行,2,5,8,11月份表示每个季度的第二个月执行,3,6,9,12月份表示每个季度的第三个月执行;</p>
+                                                <p>评级类型为月度：表示每个月的今天执.</p>
                                             </div>
                                                 <template #reference>
                                                     <el-icon :size="20" color="#3B7AD1"><QuestionFilled /></el-icon>
@@ -167,10 +162,10 @@
                             </el-col>
                         </el-row>
                         <el-row>
-                            <el-col :span="12" class="earlyWarningRight">
+                            <el-col :span="12" class="evalratingRight">
                                 <el-form-item label="规则配置">
                                     <el-tabs type="border-card">
-                                        <el-tab-pane label="指标项">
+                                        <el-tab-pane label="指标名称">
                                             <el-table
                                                 size="mini"
                                                 :show-header="false"
@@ -179,10 +174,10 @@
                                                 :border="false"
                                                 height="240"
                                                 @row-dblclick="rowDbclick"
-                                                :data="multipleSelectionArr"
+                                                :data="indicItemoptions"
                                             >
-                                                <el-table-column prop="optionName" />
-                                                <el-table-column prop="optionCode" />
+                                                <el-table-column prop="indicatorName" />
+                                                <el-table-column prop="indicatorCode" />
                                             </el-table>
                                         </el-tab-pane>
                                         <el-tab-pane label="函数">
@@ -276,8 +271,8 @@
 <script>
 import btns from '../elbuttonS.vue'
 import seachs from '../seachGroup.vue'
-import {apiGetevaluationWarningruleList, apiGetindicatorListAll, apiGetfunctionList,apiGetIndidicList,
-apiGetbinsectionList, apiGetevaluationWarningSave, apiPostevaluationwarningruleDelete} from '../../api/api'
+import {apiGetorganizationRatingruleList, apiGetindicatorListAll, apiGetfunctionList,apiGetbinstageList,
+apiGetbinsectionList, apiGetorganizationratingruleSave, apiGetorganizationratingruleRemove} from '../../api/api'
 export default {
   components: { btns,seachs },
     data() {
@@ -286,22 +281,21 @@ export default {
             title: '',
             indicItemoptions: [],
             childerindicItemoptions: [],
-            warningLeveloptions: [],
-            warningTypeoptions: [],
+            checkCycleoptions: [],
             binSectionoptions: [],
+            stageData: [],
             indicatorStr: '',
             businessStr: '',
+            stageStr: '',
             rowdataMsg: {},
             isSave: false,
             funcMsg: [],
             operator: [],
-            multipleSelectionArr: [],
             ruleForm: {
                 ruleName: '',
                 binSection: '',
-                indicatorId: '',
-                warningLevel: '',
-                warningType: '',
+                binStage: '',
+                checkCycle: 'NDKP',
                 warningDate: '',
                 isEnable: true,
                 representation: '',
@@ -309,19 +303,16 @@ export default {
             },
             rules: {
                 ruleName: [
-                    { required: true, message: '请输入预警名称', trigger: 'blur' }
+                    { required: true, message: '请输入评级名称', trigger: 'blur' }
                 ],
                 binSection: [
                     { required: true, message: '请选择业务属性', trigger: 'change' }
                 ],
-                indicatorId: [
-                    { required: true, message: '请选择指标名称', trigger: 'change' }
-                ],
-                warningLevel: [
-                    { required: true, message: '请选择预警等级', trigger: 'change' }
+                binStage: [
+                    { required: true, message: '请选择业务阶段', trigger: 'change' }
                 ],
-                warningType: [
-                    { required: true, message: '请选择预警类型', trigger: 'change' }
+                checkCycle: [
+                    { required: true, message: '请选择评级类型', trigger: 'change' }
                 ],
                 warningDate: [
                     { required: true, message: '请选择触发时间', trigger: 'change' }
@@ -334,7 +325,7 @@ export default {
                 ]
             },
             loadingImport: false,
-            earlyWarningRulesData:[],
+            evalratingRulesData:[],
             page:{
                 pagesize: 12,
                 currentPage: 1,
@@ -343,21 +334,7 @@ export default {
         }
     },
     created() {
-        this.warningLeveloptions = [
-            {
-                label: '高',
-                value: 3
-            },
-            {
-                label: '中',
-                value: 2
-            },
-            {
-                label: '低',
-                value: 1
-            }
-        ]
-        this.warningTypeoptions = [
+        this.checkCycleoptions = [
             {
                 label: '年度考评',
                 value: 'NDKP'
@@ -373,24 +350,25 @@ export default {
         ]
         this.getEvalscoringData()
         this.getDataDictionary()
-        this.getEvaluationData()
+        // this.getEvaluationData()
         this.getFunData()
         this.operator = ["+", "-", "*", "/", "(", ")", ">", ">=", "<", "<=", "==", "!=",
             "&&", "||", "!", "%", "true", "false", ".", ]
     },
     methods:{
-        // 查询预警规则数据
+        // 查询评级规则数据
         getEvalscoringData() {
             let that = this
             let params = {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
                 ruleName: that.indicatorStr,
-                binSection: that.businessStr
+                binSection: that.businessStr,
+                binStage: that.stageStr
             }
-            apiGetevaluationWarningruleList(params).then(datas =>{
+            apiGetorganizationRatingruleList(params).then(datas =>{
                 if (datas && datas.data) {
-                    that.earlyWarningRulesData = datas.data.records
+                    that.evalratingRulesData = datas.data.records
                     that.page.total = datas.data.total
                 }
             })
@@ -404,7 +382,7 @@ export default {
                 }
             })
         },
-        // 查询模块
+        // 查询属性和阶段
         getDataDictionary() {
             let that = this
             apiGetbinsectionList().then(datas =>{
@@ -412,16 +390,9 @@ export default {
                     that.binSectionoptions = datas.data
                 }
             })
-        },
-        changeIndication(val) {
-            let that = this
-            that.multipleSelectionArr = []
-            let params = {
-                indicatorId: val
-            }
-            apiGetIndidicList(params).then(datas =>{
-                if (datas) {
-                    that.multipleSelectionArr = datas
+            apiGetbinstageList().then(datas => {
+                if (datas && datas.data) {
+                    that.stageData = datas.data
                 }
             })
         },
@@ -439,7 +410,7 @@ export default {
             elInput.focus();
         },
         rowDbclick(row) {
-            this.scorRuleSplit(row.optionCode);
+            this.scorRuleSplit(row.indicatorCode);
         },
         scorRuleSplit(val) {
             let elInput = null
@@ -457,15 +428,17 @@ export default {
             elInput.selectionEnd = startPos + txtSplit.length;
         },
         changeBinstation(val) {
-            this.ruleForm.indicatorId = ''
             this.indicItemoptions = []
-            this.getEvaluationData(val)
+            if (this.ruleForm.binSection !== '' && this.ruleForm.binStage !== '') {
+                this.getEvaluationData(this.ruleForm.binSection, this.ruleForm.binStage)
+            }
         },
         // 查询指标数据
-        getEvaluationData(val) {
+        getEvaluationData(val, val1) {
             let that = this
             let params = {
-                binSection: val
+                binSection: val,
+                binStage: val1
             }
             apiGetindicatorListAll(params).then(datas =>{
                 if (datas && datas.data) {
@@ -476,14 +449,13 @@ export default {
         handleAdd() {
             this.dialogVisible = true
             this.isSave = false
-            this.title = '新增考评预警规则'
+            this.title = '新增考评评级规则'
             this.$nextTick(() =>{
                 this.ruleForm = {
                     ruleName: '',
                     binSection: '',
-                    indicatorId: '',
-                    warningLevel: '',
-                    warningType: '',
+                    binStage: '',
+                    checkCycle: 'NDKP',
                     warningDate: '',
                     isEnable: true,
                     representation: '',
@@ -494,14 +466,13 @@ export default {
         handleEdit(row) {
             this.dialogVisible = true
             this.isSave = true
-            this.title = '修改考评预警规则'
+            this.title = '修改考评评级规则'
             this.rowdataMsg = row
             this.ruleForm = {
                 ruleName: row.ruleName,
                 binSection: row.binSection,
-                indicatorId: row.indicatorId,
-                warningLevel: row.grade,
-                warningType: row.type,
+                binStage: row.binStage,
+                checkCycle: row.checkCycle,
                 warningDate: row.cronTime,
                 isEnable: row.enable,
                 representation: row.expression,
@@ -523,9 +494,8 @@ export default {
             let params = {
                 ruleName: that.ruleForm.ruleName,
                 binSection: that.ruleForm.binSection,
-                indicatorId: that.ruleForm.indicatorId,
-                grade: that.ruleForm.warningLevel,
-                type: that.ruleForm.warningType,
+                binStage: that.ruleForm.binStage,
+                checkCycle: that.ruleForm.checkCycle,
                 cronTime: that.ruleForm.warningDate+' 00:00:00',
                 enable: that.ruleForm.isEnable,
                 expression: encodeURI(that.ruleForm.representation),
@@ -535,15 +505,15 @@ export default {
                 let evalradio = that.rowdataMsg
                 params.id = evalradio.id
             }
-            apiGetevaluationWarningSave(params).then(datas =>{
+            apiGetorganizationratingruleSave(params).then(datas =>{
                 if (!that.isSave) {
                     that.$message({
-                        message: '考评预警规则新增成功',
+                        message: '考评评级规则新增成功',
                         type: 'success'
                     });
                 } else {
                     that.$message({
-                        message: '考评预警规则修改成功',
+                        message: '考评评级规则修改成功',
                         type: 'success'
                     });
                 }
@@ -559,10 +529,7 @@ export default {
                 type: 'warning'
             }).then(() => {
                 let that = this
-                let params = {
-                    id: row.id
-                }
-                apiPostevaluationwarningruleDelete(params).then(datas =>{
+                apiGetorganizationratingruleRemove(row.id).then(datas =>{
                     if (datas) {
                         that.$message({
                             type: 'success',
@@ -587,6 +554,7 @@ export default {
             this.page.currentPage = 1
             this.indicatorStr = ''
             this.businessStr = ''
+            this.stageStr = ''
             this.getEvalscoringData()
         },
         handleSizeChange(val){
@@ -602,8 +570,8 @@ export default {
 </script>
 
 <style lang="less">
-.earlyWarningRules{
-    .earlyWarningRulesBtn{
+.evalratingRules{
+    .evalratingRulesBtn{
         .collectSeach{
             display: flex;
             padding: 24px 20px;
@@ -662,7 +630,7 @@ export default {
             }
         }
     }
-    .earlyWarningRulesTableData{
+    .evalratingRulesTableData{
         .el-table{
             .el-table__body-wrapper{
                 height: 60vh !important;
@@ -715,7 +683,7 @@ export default {
                             left: 10px;
                         }
                     }
-                    .earlyWarningRight {
+                    .evalratingRight {
                         width: 100%;
                         .el-tabs{
                             width: 100%;