考评单位配置新增页面，增加是否考核，生产经营权重，前期权重，基建权重，修改单位选项，业务属性，考评规则，业务阶段去重，服务联调；考评指标配置新增页面，增加指标类别；考评部门配置，修改部门选项，服务联调；

src/api/api.js

@@ -57,6 +57,13 @@ export function apiGetIndicatorList(params) {
         params: params
     })
 }
+//----"指标类别-查询"
+export function apiGetIndicatorTypeList() {
+    return httpRequest({
+        url: 'indicator-type/list',
+        method: 'get',
+    })
+}
 //----"指标-新增/修改"
 export function apiGetIndicatorSave(params) {
     return httpRequest.post('indicator/save', params)
@@ -186,10 +193,19 @@ export function apiGetorganizationdeleteList(params) {
     })
 }
 //----单位/部门考评配置  --查询规则
-export function apiGetevaluateListAll() {
+export function apiGetevaluateListAll(params) {
     return httpRequest({
         url: 'evaluate-rule/listAll',
-        method: 'get'
+        method: 'get',
+        params: params
+    })
+}
+//----根据组织树查询部门
+export function apiGetorganizationstructureFromTree(params) {
+    return httpRequest({
+        url: 'organization-structure/getTree',
+        method: 'get',
+        params: params
     })
 }
 

src/components/evaluationSystem/IndicatorItemPage.vue

@@ -59,7 +59,7 @@
                                             <el-table-column label="序号" type="index"  align="center" />
                                             <el-table-column label="指标项名称" prop="optionName">
                                                 <template #default="scope">
-                                                    <el-select v-model="scope.row.optionName" v-if="!isSave" placeholder="请输入指标项名称" @change="(val)=>changeOptionName(val,scope.row)">
+                                                    <el-select v-model="scope.row.optionName" filterable  v-if="!isSave" placeholder="请选择指标项名称" @change="(val)=>changeOptionName(val,scope.row)">
                                                         <el-option
                                                             v-for="item in indicItemoptions"
                                                             :key="item.keyValue"

src/components/evaluationSystem/evaluationCompanyPage.vue

@@ -66,14 +66,21 @@
                 <el-table :data="evaluationCompanyData" border style="width: 100%" @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="单位名称" prop="organizationName" />
-                    <el-table-column label="考评类别" prop="organizationType" />
+                    <!-- <el-table-column label="考评类别" prop="organizationType" /> -->
                     <el-table-column label="考评周期" prop="evaluationCycle" />
-                    <el-table-column label="考评规则ID" prop="evaluateRuleId" />
-                    <el-table-column label="业务阶段" prop="binStageName" />
                     <el-table-column label="业务属性" prop="binSectionName" />
-                    <el-table-column label="年" prop="year" />
-                    <el-table-column label="月" prop="month" />
-                    <el-table-column label="创建时间" prop="createTime" />
+                    <el-table-column label="考评规则" prop="evaluateRuleName" />
+                    <el-table-column label="业务阶段" prop="binStageName" />
+                    <el-table-column label="是否考评" prop="binSectionName">
+                        <template #default="scope">
+                            <span>{{scope.row.isCheck?'是':'否'}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="生产经营权重" prop="scjyWeight" />
+                    <el-table-column label="前期权重" prop="qqWeight" />
+                    <el-table-column label="基建权重" prop="jjWeight" />
+                    <!-- <el-table-column label="年" prop="year" />
+                    <el-table-column label="月" prop="month" /> -->
                 </el-table>
                 <el-pagination
                     @size-change="handleSizeChange"
@@ -89,7 +96,7 @@
                     <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="organizationName">
-                                <el-select v-model="ruleForm.organizationName" multiple collapse-tags placeholder="请输入单位名称名称">
+                                <el-select v-model="ruleForm.organizationName" placeholder="请选择单位名称">
                                     <el-option
                                     v-for="item in companyDatas"
                                     :key="item.id"
@@ -98,8 +105,18 @@
                                     </el-option>
                                 </el-select>
                             </el-form-item>
+                            <el-form-item label="业务属性" prop="binSection">
+                                <el-select v-model="ruleForm.binSection" placeholder="请选择业务属性" @change="changeBinsection">
+                                    <el-option
+                                    v-for="item in moduleData"
+                                    :key="item.keyValue"
+                                    :label="item.keyName"
+                                    :value="item.keyValue">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
                             <el-form-item label="考评规则" prop="evaluateRule">
-                                <el-select v-model="ruleForm.evaluateRule" placeholder="请选择考评规则" @change="changeRule">
+                                <el-select v-model="ruleForm.evaluateRule" multiple collapse-tags  placeholder="请选择考评规则" @change="changeRule">
                                     <el-option
                                     v-for="item in ruleDataAll"
                                     :key="item.id"
@@ -109,7 +126,7 @@
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="业务阶段">
-                                <el-select v-model="ruleForm.binStage" placeholder="请选择业务阶段" disabled>
+                                <el-select v-model="ruleForm.binStage" multiple placeholder="请选择业务阶段" disabled>
                                     <el-option
                                     v-for="item in stageData"
                                     :key="item.keyValue"
@@ -118,16 +135,6 @@
                                     </el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="业务属性">
-                                <el-select v-model="ruleForm.binSection" placeholder="请选择业务属性" disabled>
-                                    <el-option
-                                    v-for="item in moduleData"
-                                    :key="item.keyValue"
-                                    :label="item.keyName"
-                                    :value="item.keyValue">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
                             <el-form-item label="考评周期" prop="evaluationCycle">
                                 <el-select v-model="ruleForm.evaluationCycle" placeholder="请选择业务阶段">
                                     <el-option
@@ -138,7 +145,22 @@
                                     </el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="年份" prop="year">
+                            <el-form-item label="是否考核">
+                                <el-radio-group v-model="ruleForm.isCheck">
+                                    <el-radio border label="是" />
+                                    <el-radio border label="否" />
+                                </el-radio-group>
+                            </el-form-item>
+                            <el-form-item label="生产经营权重" prop="scjyWeight">
+                                <el-input-number v-model="ruleForm.scjyWeight" :precision="2" :step="0.1" :min="0" :max="1" placeholder="请输入生产经营权重" />
+                            </el-form-item>
+                            <el-form-item label="前期权重" prop="qqWeight">
+                                <el-input-number v-model="ruleForm.qqWeight" :precision="2" :step="0.1" :min="0" :max="1" placeholder="请输入前期权重" />
+                            </el-form-item>
+                            <el-form-item label="基建权重" prop="jjWeight">
+                                <el-input-number v-model="ruleForm.jjWeight" :precision="2" :step="0.1" :min="0" :max="1" placeholder="请输入基建权重" />
+                            </el-form-item>
+                            <!-- <el-form-item label="年份" prop="year">
                                 <el-date-picker
                                     v-model="ruleForm.year"
                                     type="year"
@@ -148,7 +170,7 @@
                             </el-form-item>
                             <el-form-item label="月份">
                                 <el-input-number v-model="ruleForm.month" :min="1" :max="12" />
-                            </el-form-item>
+                            </el-form-item> -->
                             <el-form-item label="指标顺序">
                                 <el-input-number v-model="ruleForm.orderNum" :min="1" />
                             </el-form-item>
@@ -188,27 +210,28 @@ export default {
             ruleDataAll: [],
             periodData: [],
             ruleForm: {
-                organizationName: [],
-                evaluateRule: '',
+                organizationName: '',
+                evaluateRule: [],
                 binSection: '',
-                binStage: '',
+                binStage: [],
                 evaluationCycle: '',
-                year: '',
-                month: 1,
+                isCheck: '是',
+                scjyWeight: 0,
+                qqWeight: 0,
+                jjWeight: 0,
+                // year: '',
+                // month: 1,
                 orderNum: 1
             },
             rules: {
                 organizationName: [
-                    { required: true, message: '请输入单位名称', trigger: 'blur' }
-                ],
-                evaluateRule: [
-                    { required: true, message: '请选择考评规则', trigger: 'change' }
+                    { required: true, message: '请选择单位名称', trigger: 'change' }
                 ],
                 binSection: [
                     { required: true, message: '请选择业务属性', trigger: 'change' }
                 ],
-                binStage: [
-                    { required: true, message: '请输入业务阶段', trigger: 'change' }
+                evaluateRule: [
+                    { required: true, message: '请选择考评规则', trigger: 'change' }
                 ],
                 evaluationCycle: [
                     { required: true, message: '请选择考评周期', trigger: 'change' }
@@ -283,9 +306,14 @@ export default {
                 }
             })
         },
-        getRuleallData() {
+        getRuleallData(val) {
             let that = this
-            apiGetevaluateListAll().then(datas =>{
+            let params = {
+                // pageNum: 1,
+                // pageSize: 50,
+                binSection: val
+            }
+            apiGetevaluateListAll(params).then(datas =>{
                 if (datas && datas.data) {
                     that.ruleDataAll = datas.data
                 }
@@ -303,12 +331,25 @@ export default {
                 }
             })
         },
+        changeBinsection(val) {
+            this.getRuleallData(val)
+        },
         changeRule(val) {
-            this.ruleDataAll.forEach(item =>{
-                if (item.id === val) {
-                    this.ruleForm.binSection = item.binSection
-                    this.ruleForm.binStage = item.binStage
+            let binStageArr = []
+            for(let i =0; i<this.ruleDataAll.length; i++) {
+                let item = this.ruleDataAll[i]
+                for(let j =0; j<val.length; j++) {
+                    let itn = val[j]
+                    if (item.id === itn) {
+                        binStageArr.push(item.binStage)
+                    }
                 }
+            }
+            this.ruleForm.binStage = this.useFilter(binStageArr)
+        },
+        useFilter(arr) {
+            return arr.filter(function(item,index){
+                return arr.indexOf(item) === index;  // 因为indexOf 只能查找到第一个  
             })
         },
         handleAdd() {
@@ -318,13 +359,17 @@ export default {
             this.$nextTick(() =>{
                 // this.$refs['ruleForm'].resetFields()
                 this.ruleForm = {
-                    organizationName: [],
-                    evaluateRule: '',
+                    organizationName: '',
+                    evaluateRule: [],
                     binSection: '',
-                    binStage: '',
+                    binStage: [],
                     evaluationCycle: '',
-                    year: '',
-                    month: 1,
+                    isCheck: '是',
+                    scjyWeight: 0,
+                    qqWeight: 0,
+                    jjWeight: 0,
+                    // year: '',
+                    // month: 1,
                     orderNum: 1
                 }
             })
@@ -335,13 +380,17 @@ export default {
             this.title = '修改考评单位'
             this.evalradio = this.changeDateSelect[0]
             this.ruleForm = {
-                organizationName: this.evalradio.organizationName,
+                organizationName: this.evalradio.organizationId,
                 evaluationCycle: this.evalradio.evaluationCycle,
-                evaluateRule: this.evalradio.evaluateRuleId,
+                evaluateRule: this.evalradio.evaluateRuleId.split(','),
                 binSection: this.evalradio.binSection,
-                binStage: this.evalradio.binStage,
-                year: this.evalradio.year,
-                month: this.evalradio.month,
+                binStage: this.evalradio.binStage.split(','),
+                isCheck: this.evalradio.scjyWeight?'是':'否',
+                scjyWeight: this.evalradio.scjyWeight,
+                qqWeight: this.evalradio.qqWeight,
+                jjWeight: this.evalradio.jjWeight,
+                // year: this.evalradio.year,
+                // month: this.evalradio.month,
                 orderNum: this.evalradio.orderNum
             }
         },
@@ -356,46 +405,55 @@ export default {
         //新增/修改指标数据
         saveAndEditIndicatorData() {
             let that = this
-            let unitListArr = []
-            for(let i =0; i<that.companyDatas.length; i++) {
-                let item = that.companyDatas[i]
-                for(let j =0; j<that.ruleForm.organizationName.length; j++) {
-                    let itn = that.ruleForm.organizationName[j]
-                    if (item.id === itn) {
-                        unitListArr.push(item)
-                    }
+            let orgName = ''
+            that.companyDatas.forEach(item =>{
+                if (item.id === that.ruleForm.organizationName) {
+                    orgName = item.name
                 }
-            }
-            let params = {
-                // organizationName: that.ruleForm.organizationName,
-                unitList: unitListArr,
+            })
+            let params = {                
+                organizationName: orgName,
                 evaluationCycle: that.ruleForm.evaluationCycle,
                 organizationType: 'DWKP',
-                evaluateRuleId: that.ruleForm.evaluateRule,
+                evaluateRuleId: that.ruleForm.evaluateRule.join(','),
                 binSection: that.ruleForm.binSection,
-                binStage: that.ruleForm.binStage,
+                binStage: that.ruleForm.binStage.join(','),
                 orderNum: that.ruleForm.orderNum,
-                year: that.ruleForm.year,
-                month: that.ruleForm.month
+                isCheck: that.ruleForm.isCheck === '是'?true:false,
+                scjyWeight: that.ruleForm.scjyWeight,
+                qqWeight: that.ruleForm.qqWeight,
+                jjWeight: that.ruleForm.jjWeight,
+                // year: that.ruleForm.year,
+                // month: that.ruleForm.month
             }
             if (that.isSave) {
                 params.id = this.evalradio.id
+                params.organizationId = that.evalradio.organizationId
+            } else {
+                params.organizationId = that.ruleForm.organizationName
             }
             apiGetorganizationSaveList(params).then(datas =>{
-                if (!that.isSave) {
+                if (!datas.success) {
                     that.$message({
-                        message: '考评单位新增成功',
-                        type: 'success'
+                        message: datas.message,
+                        type: 'error'
                     });
                 } else {
-                    that.$message({
-                        message: '考评单位修改成功',
-                        type: 'success'
-                    });
+                    if (!that.isSave) {
+                        that.$message({
+                            message: '考评单位新增成功',
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message({
+                            message: '考评单位修改成功',
+                            type: 'success'
+                        });
+                    }
+                    that.dialogVisible = false
+                    that.changeDateSelect = []
+                    that.getEvalCompanyData()
                 }
-                that.dialogVisible = false
-                that.changeDateSelect = []
-                that.getEvalCompanyData()
             })
         },
         //删除指标数据

src/components/evaluationSystem/evaluationDepartmentPage.vue

@@ -68,7 +68,7 @@
                     <el-table-column label="部门名称" prop="organizationName" />
                     <el-table-column label="考评类别" prop="organizationType" />
                     <el-table-column label="考评周期" prop="evaluationCycle" />
-                    <el-table-column label="考评规则ID" prop="evaluateRuleId" />
+                    <el-table-column label="考评规则" prop="evaluateRuleName" />
                     <el-table-column label="业务阶段" prop="binStageName" />
                     <el-table-column label="业务属性" prop="binSectionName" />
                     <!-- <el-table-column label="年" prop="year" />
@@ -89,7 +89,14 @@
                     <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="organizationName">
-                                <el-input v-model="ruleForm.organizationName" placeholder="请输入部门名称名称"></el-input>
+                                <el-select v-model="ruleForm.organizationName" placeholder="请选择部门" @change="changeRule">
+                                    <el-option
+                                    v-for="item in departmentDataAll"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id">
+                                    </el-option>
+                                </el-select>
                             </el-form-item>
                             <el-form-item label="考评规则" prop="evaluateRule">
                                 <el-select v-model="ruleForm.evaluateRule" placeholder="请选择考评规则" @change="changeRule">
@@ -153,7 +160,7 @@
 <script>
 import importDailog from '../importPage/importDailog.vue'
 import {apiGetOrganizationList, apiGetorganizationSaveList, apiGetorganizationdeleteList, 
-apiGetdatadictionaryList, apiGetevaluateListAll} from '../../api/api'
+apiGetdatadictionaryList, apiGetevaluateListAll, apiGetorganizationstructureFromTree} from '../../api/api'
 export default {
   components: { importDailog },
     data() {
@@ -169,6 +176,7 @@ export default {
             stageData: [],
             ruleDataAll: [],
             periodData: [],
+            departmentDataAll: [],
             ruleForm: {
                 organizationName: '',
                 evaluateRule: '',
@@ -179,7 +187,7 @@ export default {
             },
             rules: {
                 organizationName: [
-                    { required: true, message: '请输入部门名称', trigger: 'blur' }
+                    { required: true, message: '请选择部门名称', trigger: 'change' }
                 ],
                 evaluationCycle: [
                     { required: true, message: '请选择考评周期', trigger: 'change' }
@@ -212,9 +220,10 @@ export default {
         this.getDataDictionary('MK0001') //模块
         this.getDataDictionary('JD0001') //阶段
         this.getPeriodData()
+        this.getDepartmentFromTreeData()
     },
     methods:{
-        // 查询部门数据
+        // 查询部门列表数据
         getEvalCompanyData(type) {
             let that = this
             let params = {
@@ -232,6 +241,19 @@ export default {
                 }
             })
         },
+        //根据组织树查询部门
+        getDepartmentFromTreeData() {
+            let that = this
+            let params = {
+                id: '23031001',
+                num: 1
+            }
+            apiGetorganizationstructureFromTree(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.departmentDataAll = datas.data[0].children
+                }
+            })
+        },
         // 查询规则模块和阶段数据
         getDataDictionary(val) {
             let that = this
@@ -298,7 +320,7 @@ export default {
             this.title = '修改考评部门'
             this.evalradio = this.changeDateSelect[0]
             this.ruleForm = {
-                organizationName: this.evalradio.organizationName,
+                organizationName: this.evalradio.organizationId,
                 evaluationCycle: this.evalradio.evaluationCycle,
                 evaluateRule: this.evalradio.evaluateRuleId,
                 binSection: this.evalradio.binSection,
@@ -317,8 +339,14 @@ export default {
         //新增/修改指标数据
         saveAndEditIndicatorData() {
             let that = this
+            let orgName = ''
+            that.departmentDataAll.forEach(item =>{
+                if (item.id === that.ruleForm.organizationName) {
+                    orgName = item.name
+                }
+            })
             let params = {
-                organizationName: that.ruleForm.organizationName,
+                organizationName: orgName,
                 evaluationCycle: that.ruleForm.evaluationCycle,
                 organizationType: 'BMKP',
                 evaluateRuleId: that.ruleForm.evaluateRule,
@@ -327,23 +355,33 @@ export default {
                 orderNum: that.ruleForm.orderNum
             }
             if (that.isSave) {
-                params.id = this.evalradio.id
+                params.id = that.evalradio.id
+                params.organizationId = that.evalradio.organizationName
+            } else {
+                params.organizationId = that.ruleForm.organizationName
             }
             apiGetorganizationSaveList(params).then(datas =>{
-                if (!that.isSave) {
+                if (!datas.success) {
                     that.$message({
-                        message: '考评部门新增成功',
-                        type: 'success'
+                        message: datas.message,
+                        type: 'error'
                     });
                 } else {
-                    that.$message({
-                        message: '考评部门修改成功',
-                        type: 'success'
-                    });
+                    if (!that.isSave) {
+                        that.$message({
+                            message: '考评部门新增成功',
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message({
+                            message: '考评部门修改成功',
+                            type: 'success'
+                        });
+                    }
+                    that.dialogVisible = false
+                    that.changeDateSelect = []
+                    that.getEvalCompanyData()
                 }
-                that.dialogVisible = false
-                that.changeDateSelect = []
-                that.getEvalCompanyData()
             })
         },
         //删除指标数据

src/components/evaluationSystem/evaluationIndexPage.vue

@@ -67,6 +67,7 @@
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="指标名称" prop="indicatorName" />
                     <el-table-column label="指标编码" prop="indicatorCode" />
+                    <el-table-column label="指标类型" prop="indicatorTypeName" />
                     <el-table-column label="指标单位" prop="unit" />
                     <el-table-column label="业务阶段" prop="binStageName" />
                     <el-table-column label="业务属性" prop="binSectionName" />
@@ -109,6 +110,16 @@
                             <el-form-item label="指标编码" prop="indicatorCode">
                                 <el-input v-model="ruleForm.indicatorCode" placeholder="请输入指标编码" :disabled="isSave"></el-input>
                             </el-form-item>
+                            <el-form-item label="指标类别" prop="indicatorType">
+                                <el-select v-model="ruleForm.indicatorType" placeholder="请选择所属部门">
+                                    <el-option
+                                    v-for="item in indicatorTypeData"
+                                    :key="item.id"
+                                    :label="item.typeName"
+                                    :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
                             <el-form-item label="指标单位" prop="indicatorUnit">
                                 <el-input v-model="ruleForm.indicatorUnit" placeholder="请输入指标单位"></el-input>
                             </el-form-item>
@@ -186,7 +197,7 @@
 import importDailog from '../importPage/importDailog.vue'
 import indicatorItem from './IndicatorItemPage.vue'
 import {apiGetIndicatorList, apiGetIndicatorSave, apiGetIndicatorDelete,
- apiGetIndicatordictionaryList, apiGetdatadictionaryList} from '../../api/api'
+ apiGetIndicatorTypeList, apiGetdatadictionaryList} from '../../api/api'
 export default {
   components: { importDailog, indicatorItem },
     data() {
@@ -200,14 +211,16 @@ export default {
             moduleData: [],
             stageData: [],
             departData: [],
+            indicatorTypeData: [],
             ruleForm: {
                 indicatorName: '',
                 indicatorCode: '',
+                indicatorType: '',
                 indicatorUnit: '',
                 department: '',
                 binSection: '',
                 binStage: '',
-                isQuantified: '否',
+                isQuantified: '是',
                 isAdditional: '否',
                 isChild: '否',
                 orderNum: 1,
@@ -215,16 +228,19 @@ export default {
             },
             rules: {
                 indicatorName: [
-                    { required: true, message: '请选择指标名称', trigger: 'change' }
+                    { required: true, message: '请输入指标名称', trigger: 'blur' }
                 ],
                 indicatorCode: [
                     { required: true, message: '请输入指标编码', trigger: 'blur' }
                 ],
+                indicatorType: [
+                    { required: true, message: '请选择指标类别', trigger: 'change' }
+                ],
                 indicatorUnit: [
                     { required: true, message: '请输入指标单位', trigger: 'blur' }
                 ],
                 department: [
-                    { required: true, message: '请输入所属单位', trigger: 'blur' }
+                    { required: true, message: '请选择所属部门', trigger: 'change' }
                 ],
                 binSection: [
                     { required: true, message: '请选择业务属性', trigger: 'change' }
@@ -253,6 +269,7 @@ export default {
         this.getDataDictionary('MK0001') //模块
         this.getDataDictionary('JD0001') //阶段
         this.getDataDictionary('BM0001') //部门
+        this.getindicatorTypeData()
     },
     methods:{
         // 查询指标数据
@@ -272,6 +289,15 @@ export default {
                 }
             })
         },
+        // 查询指标类别
+        getindicatorTypeData() {
+            let that = this
+            apiGetIndicatorTypeList().then(datas =>{
+                if (datas && datas.data) {
+                    that.indicatorTypeData = datas.data
+                }
+            })
+        },
         // 查询部门
         // 查询规则模块和阶段数据
         getDataDictionary(val) {
@@ -300,11 +326,12 @@ export default {
                 this.ruleForm = {
                     indicatorName: '',
                     indicatorCode: '',
+                    indicatorType: '',
                     indicatorUnit: '',
                     department: '',
                     binSection: '',
                     binStage: '',
-                    isQuantified: '否',
+                    isQuantified: '是',
                     isAdditional: '否',
                     isChild: '否',
                     orderNum: 1,
@@ -320,6 +347,7 @@ export default {
             this.ruleForm = {
                 indicatorName: this.evalradio.indicatorName,
                 indicatorCode: this.evalradio.indicatorCode,
+                indicatorType: this.evalradio.indicatorTypeId,
                 indicatorUnit: this.evalradio.unit,
                 department: this.evalradio.dept,
                 binSection: this.evalradio.binSection,
@@ -345,6 +373,7 @@ export default {
             let params = {
                 indicatorName: that.ruleForm.indicatorName,
                 indicatorCode: that.ruleForm.indicatorCode,
+                indicatorTypeId: that.ruleForm.indicatorType,
                 unit: that.ruleForm.indicatorUnit,
                 dept: that.ruleForm.department,
                 binSection: that.ruleForm.binSection,
@@ -359,20 +388,27 @@ export default {
                 params.id = this.evalradio.id
             }
             apiGetIndicatorSave(params).then(datas =>{
-                if (!that.isSave) {
+                if (!datas.success) {
                     that.$message({
-                        message: '指标新增成功',
-                        type: 'success'
+                        message: datas.message,
+                        type: 'error'
                     });
                 } else {
-                    that.$message({
-                        message: '指标修改成功',
-                        type: 'success'
-                    });
+                    if (!that.isSave) {
+                        that.$message({
+                            message: '指标新增成功',
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message({
+                            message: '指标修改成功',
+                            type: 'success'
+                        });
+                    }
+                    that.dialogVisible = false
+                    that.changeDateSelect = []
+                    that.getEvaluationData()
                 }
-                that.dialogVisible = false
-                that.changeDateSelect = []
-                that.getEvaluationData()
             })
         },
         //删除指标数据
@@ -437,7 +473,7 @@ export default {
 
 <style lang="less">
 .evaluationIndex{
-  .evaluationIndexBtn{
+    .evaluationIndexBtn{
     //   background: #fff;
         padding: 10px 20px 0 20px;
         .collectSeach{
@@ -500,6 +536,7 @@ export default {
         .indexdialog{
             .el-overlay{
                 .el-dialog{
+                    margin-top: 10vh;
                     .el-dialog__body{
                         padding: 30px 60px 30px 20px !important;
                         .periodFrom{

src/components/evaluationSystem/evaluationPersonnelPage.vue

@@ -456,20 +456,27 @@ export default {
                 params.id = this.evalradio.id
             }
             apiGetpersonnelSaveList(params).then(datas =>{
-                if (!that.isSave) {
+                if (!datas.success) {
                     that.$message({
-                        message: '考评人员新增成功',
-                        type: 'success'
+                        message: datas.message,
+                        type: 'error'
                     });
                 } else {
-                    that.$message({
-                        message: '考评人员修改成功',
-                        type: 'success'
-                    });
+                    if (!that.isSave) {
+                        that.$message({
+                            message: '考评人员新增成功',
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message({
+                            message: '考评人员修改成功',
+                            type: 'success'
+                        });
+                    }
+                    that.dialogVisible = false
+                    that.changeDateSelect = []
+                    that.getEvalpersonData()
                 }
-                that.dialogVisible = false
-                that.changeDateSelect = []
-                that.getEvalpersonData()
             })
         },
         //删除指标数据

src/components/evaluationSystem/evaluationRulesPage.vue

@@ -267,20 +267,27 @@ export default {
                 params.id = this.evalradio.id
             }
             apiGetevaluateRuleSaveList(params).then(datas =>{
-                if (!that.isSave) {
+                if (!datas.success) {
                     that.$message({
-                        message: '指标新增成功',
-                        type: 'success'
+                        message: datas.message,
+                        type: 'error'
                     });
                 } else {
-                    that.$message({
-                        message: '指标修改成功',
-                        type: 'success'
-                    });
+                    if (!that.isSave) {
+                        that.$message({
+                            message: '指标新增成功',
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message({
+                            message: '指标修改成功',
+                            type: 'success'
+                        });
+                    }
+                    that.dialogVisible = false
+                    that.changeDateSelect = []
+                    that.getEvalRuleData()
                 }
-                that.dialogVisible = false
-                that.changeDateSelect = []
-                that.getEvalRuleData()
             })
         },
         //删除指标数据