年度考评页面，任务列表页面增加，增加功能，服务联调；修改样式适配应用商店；小问题修改；

src/api/api.js

@@ -67,6 +67,55 @@ export function apiPostremoveByToken(params) {
     })
 }
 
+
+//----------------------------------------任务中心------------------------------------------------
+//---------列表
+export function apiPostTodoTaskList(params) {
+    return httpRequest.post('workflow/todoTaskList', params)
+}
+//----------同意/拒绝审批
+export function apiPostIsdoAction(params) {
+    return httpRequest.post('workflow/isOkAction', params)
+}
+//----------根据流程ID获取业务ID
+export function apiPostgetInstanceAndChildren(params) {
+    return httpRequest({
+        url: 'workflow/getInstanceAndChildren',
+        method: 'post',
+        params: params
+    })
+}
+//----------任务处理-获取考评启动详情
+export function apiGettaskevalStartDetail(params) {
+    return httpRequest({
+        url: 'dept-responsibility/getByidAndInfo',
+        method: 'get',
+        params: params
+    })
+}
+//----------任务处理-获取考评启动详情
+export function apiGettaskmothAyearDetail(params) {
+    return httpRequest({
+        url: 'organization-evaluation/getByidAndInfo',
+        method: 'get',
+        params: params
+    })
+}
+
+//考评得分统计查询
+export function apiGetscoreCountList(params) {
+    return httpRequest({
+        url: 'score_count/list',
+        method: 'get',
+        params: params
+    })
+}
+//考评得分统计修改
+export function apiPostScoreCountSave(params) {
+    return httpRequest.post('score_count/save', params)
+}
+
+
 //----------------------------------------考评业务------------------------------------------------
 
 //获取审批流程数据
@@ -231,42 +280,6 @@ export function apiGetEvalReportinfoList(params) {
     })
 }
 
-
-//----------------------------------------任务中心------------------------------------------------
-//---------列表
-export function apiPostTodoTaskList(params) {
-    return httpRequest.post('workflow/todoTaskList', params)
-}
-//----------同意/拒绝审批
-export function apiPostIsdoAction(params) {
-    return httpRequest.post('workflow/isOkAction', params)
-}
-//----------根据流程ID获取业务ID
-export function apiPostgetInstanceAndChildren(params) {
-    return httpRequest({
-        url: 'workflow/getInstanceAndChildren',
-        method: 'post',
-        params: params
-    })
-}
-//----------任务处理-获取考评启动详情
-export function apiGettaskevalStartDetail(params) {
-    return httpRequest({
-        url: 'dept-responsibility/getByidAndInfo',
-        method: 'get',
-        params: params
-    })
-}
-//----------任务处理-获取考评启动详情
-export function apiGettaskmothAyearDetail(params) {
-    return httpRequest({
-        url: 'organization-evaluation/getByidAndInfo',
-        method: 'get',
-        params: params
-    })
-}
-
-
 //----------------------------------------考评体系配置------------------------------------------------
 //----考评指标管理
 //----"指标-查询"

src/components/assessment/evaluationReportPage.vue

@@ -296,7 +296,7 @@ export default {
         .evaluationReportTableData{
             .el-table{
                 .el-table__body-wrapper{
-                    height: 64vh !important;
+                    height: 60vh !important;
                 }
                 .el-input__inner{
                     height: 30px !important;

src/components/assessment/evaluationStartFrom.vue

@@ -73,12 +73,25 @@
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门"  prop="deptName" width="260" />
                             <el-table-column label="指标分类" prop="typeName" />
-                            <el-table-column label="计划值">
+                            <el-table-column label="目标值">
                                 <template #default="scope">
-                                    <el-input-number v-model="scope.row.quantifiedValue" :precision="2" :step="0.1" :min="0" />
+                                    <el-input-number v-model="scope.row.quantifiedValue"
+                                     :precision="2" :step="0.1" :min="0" :disabled="!scope.row.updateMark" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="单位" prop="unit" />
+                            <el-table-column label="审核状态">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.state" placeholder="请选择审核状态" :disabled="!scope.row.updateMark">
+                                        <el-option
+                                        v-for="item in statusData"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </el-tab-pane>
                     <el-tab-pane label="考评评价指标内容" name="second">
@@ -164,9 +177,21 @@
                                     </el-select>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="计划值">
+                            <el-table-column label="目标值">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.nonQuantifiedValue" />
+                                    <el-input v-model="scope.row.nonQuantifiedValue" :disabled="!scope.row.updateMark" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="审核状态">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.state" placeholder="请选择审核状态" :disabled="!scope.row.updateMark">
+                                        <el-option
+                                        v-for="item in statusData"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -218,10 +243,25 @@ export default {
             stageData: [],
             indicItemoptions: [],
             sectionNameArr: [],
-            deptNameArr: []
+            deptNameArr: [],
+            statusData: []
         }
     },
     created() {
+        this.statusData = [
+            {
+                name: '已完成',
+                id: '1'
+            },
+            {
+                name: '待审核',
+                id: '0'
+            },
+            {
+                name: '未开始',
+                id: '-1'
+            }
+        ]
     },
     methods: {
         init(row) {
@@ -330,7 +370,7 @@ export default {
                     // let nonarr = []
                     if (datas.data.nonQuantifiedList.length>0) {
                         datas.data.nonQuantifiedList.forEach(it =>{
-                            it.childName = it.organizationName //指标id
+                            it.childName = it.indicatorName //指标id
                             // nonarr.push(obj)
                         })
                     }
@@ -349,7 +389,7 @@ export default {
                 optionName: '',
                 nonQuantifiedValue: ''
             }
-            this.nonQuantifiedList.push(obj)
+            this.nonQuantifiedList.unshift(obj)
         },
         saveDetail() {
             let that = this
@@ -359,7 +399,8 @@ export default {
                     let obj = {
                         id: item.id,
                         isQuantified: '是',
-                        quantifiedValue: item.quantifiedValue
+                        quantifiedValue: item.quantifiedValue,
+                        state: item.state
                     }
                     params.push(obj)
                 })
@@ -369,15 +410,16 @@ export default {
                         isQuantified: '否',
                         quantifiedValue: 0.0,
                         optionCode: 'ZRMB', // 指标项
-                        nonQuantifiedValue: item.nonQuantifiedValue
+                        nonQuantifiedValue: item.nonQuantifiedValue,
+                        state: item.state,
+                        deptResponsibilityId: that.rowMsg.id
                     }
                     if (item.showInput) {
-                        obj.deptResponsibilityId = that.rowMsg.id
                         obj.organizationEvaluationRuleId = item.organizationName //单位id
                         obj.indicatorId = item.childName //指标id
                         
                     } else {
-                        obj.deptResponsibilityId = item.id
+                        obj.id = item.id
                         obj.organizationEvaluationRuleId = item.organizationEvaluationRuleId
                         obj.indicatorId = item.indicatorId
                     }

src/components/assessment/evaluationStartPage.vue

@@ -517,7 +517,7 @@ export default {
         .evaluationStartTableData{
             .el-table{
                 .el-table__body-wrapper{
-                    height: 64vh !important;
+                    height: 60vh !important;
                 }
                 .el-input__inner{
                     height: 30px !important;

src/components/assessment/evaluationYearFrom.vue

@@ -77,25 +77,128 @@
                             <el-table-column label="指标项" prop="optionName" />
                             <el-table-column label="值" width="150">
                                 <template #default="scope">
-                                    <el-input-number v-model="scope.row.quantifiedValue" :precision="2" :step="0.1" :min="0" />
+                                    <el-input-number v-model="scope.row.quantifiedValue"
+                                     :precision="2" :step="0.1" :min="0" :disabled="!scope.row.updateMark" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="单位" prop="unit" />
+                            <el-table-column label="审核状态">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.state" placeholder="请选择审核状态" :disabled="!scope.row.updateMark">
+                                        <el-option
+                                        v-for="item in statusData"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </el-tab-pane>
                     <el-tab-pane label="考评评价指标内容" name="second">
                         <el-table :data="nonQuantifiedList" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
-                            <el-table-column label="业务阶段" prop="stageName" />
-                            <el-table-column label="业务属性" prop="sectionName" />
-                            <el-table-column label="单位名称" prop="organizationName" width="300" />
-                            <el-table-column label="填报部门" prop="deptName" width="260" />                                
-                            <el-table-column label="指标分类" prop="typeName" />
-                            <el-table-column label="指标名称" prop="childName" />
-                            <el-table-column label="指标项" prop="optionName" />
-                            <el-table-column label="值" width="150">
+                            <el-table-column label="单位名称" prop="organizationName" width="300">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.nonQuantifiedValue" />
+                                    <el-select v-model="scope.row.organizationName" placeholder="请选择单位名称"
+                                    :disabled="!scope.row.showInput"
+                                     @change="changeOrgZa">
+                                        <el-option
+                                        v-for="item in orgruleData"
+                                        :key="item.id"
+                                        :label="item.organizationName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="指标分类" prop="typeName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.typeName" :disabled="!scope.row.showInput" placeholder="请选择指标分类">
+                                        <el-option
+                                        v-for="item in indicatorTypeData"
+                                        :key="item.id"
+                                        :label="item.typeName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="业务阶段" prop="stageName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.stageName" placeholder="请选择业务阶段"
+                                    :disabled="!scope.row.showInput"
+                                     @change="(val)=>changeIndic(val, scope.row)">
+                                        <el-option
+                                        v-for="item in stageData"
+                                        :key="item.id"
+                                        :label="item.stageName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="业务属性" prop="sectionName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.sectionName" placeholder="请选择业务阶段"
+                                    :disabled="!scope.row.showInput"
+                                     @change="(val)=>changeIndic(val, scope.row)">
+                                        <el-option
+                                        v-for="item in sectionNameArr"
+                                        :key="item.id"
+                                        :label="item.secName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="指标名称" prop="childName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.childName" placeholder="请选择指标名称"
+                                    :disabled="!scope.row.showInput"
+                                     @change="changeDept">
+                                        <el-option
+                                        v-for="item in indicItemoptions"
+                                        :key="item.id"
+                                        :label="item.indicatorName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="填报部门" prop="deptName" width="260">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.deptName" placeholder="请选择填报部门" :disabled="!scope.row.showInput">
+                                        <el-option
+                                        v-for="item in deptNameArr"
+                                        :key="item.id"
+                                        :label="item.deptName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="指标项" prop="optionName">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.optionName" disabled />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="计划值">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.nonQuantifiedValue" :disabled="scope.row.showInput || !scope.row.updateMark" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="审核状态">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.state" placeholder="请选择审核状态" :disabled="!scope.row.updateMark">
+                                        <el-option
+                                        v-for="item in statusData"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -141,10 +244,25 @@ export default {
             saveIcon: saveIcon,
             editIcon: editIcon,
             deleteIcon: deleteIcon,
-            rowMsg: {}
+            rowMsg: {},
+            statusData: []
         }
     },
     created() {
+        this.statusData = [
+            {
+                name: '已完成',
+                id: '1'
+            },
+            {
+                name: '待审核',
+                id: '0'
+            },
+            {
+                name: '未开始',
+                id: '-1'
+            }
+        ]
     },
     methods: {
         init(row) {
@@ -180,11 +298,11 @@ export default {
             apiGetOrgEvalInfoList(params).then(datas =>{
                 if (datas && datas.data) {
                     that.quantifiedList = datas.data.quantifiedList
-                    if (datas.data.nonQuantifiedList.length>0) {
-                        datas.data.nonQuantifiedList.forEach(it =>{
-                            it.childName = it.organizationName //指标id
-                        })
-                    }
+                    // if (datas.data.nonQuantifiedList.length>0) {
+                    //     datas.data.nonQuantifiedList.forEach(it =>{
+                    //         it.childName = it.indicatorName //指标id
+                    //     })
+                    // }
                     that.nonQuantifiedList = datas.data.nonQuantifiedList.length>0?datas.data.nonQuantifiedList:[]
                 }
             })
@@ -232,6 +350,7 @@ export default {
         },
         changeIndic(val, row) {
             if (row.stageName !== '' && row.sectionName !== '') {
+                row.childName = ''
                 this.getIndListAll(row)
             }
         },
@@ -270,7 +389,7 @@ export default {
                 optionName: '',
                 nonQuantifiedValue: ''
             }
-            this.nonQuantifiedList.push(obj)
+            this.nonQuantifiedList.unshift(obj)
         },
         saveDetail() {
             let that = this
@@ -280,7 +399,8 @@ export default {
                     let obj = {
                         id: item.id,
                         isQuantified: '是',
-                        quantifiedValue: item.quantifiedValue
+                        quantifiedValue: item.quantifiedValue,
+                        state: item.state
                     }
                     params.push(obj)
                 })
@@ -290,15 +410,16 @@ export default {
                         isQuantified: '否',
                         quantifiedValue: 0.0,
                         optionCode: 'ZRMB', // 指标项
-                        nonQuantifiedValue: item.nonQuantifiedValue
+                        nonQuantifiedValue: item.nonQuantifiedValue,
+                        state: item.state
                     }
                     if (item.showInput) {
-                        obj.deptResponsibilityId = that.rowMsg.id
+                        obj.organizationEvaluationId = that.rowMsg.id
                         obj.organizationEvaluationRuleId = item.organizationName //单位id
                         obj.indicatorId = item.childName //指标id
                         
                     } else {
-                        obj.deptResponsibilityId = item.id
+                        obj.id = item.id
                         obj.organizationEvaluationRuleId = item.organizationEvaluationRuleId
                         obj.indicatorId = item.indicatorId
                     }

src/components/assessment/evaluationYearPage.vue

@@ -534,7 +534,7 @@ export default {
         .evaluationYearTableData{
             .el-table{
                 .el-table__body-wrapper{
-                    height: 64vh !important;
+                    height: 60vh !important;
                 }
                 .el-input__inner{
                     height: 30px !important;

src/components/assessment/monthQuarterFrom.vue

@@ -77,10 +77,23 @@
                             <el-table-column label="指标项" prop="optionName" />
                             <el-table-column label="值" width="150">
                                 <template #default="scope">
-                                    <el-input-number v-model="scope.row.quantifiedValue" :precision="2" :step="0.1" :min="0" />
+                                    <el-input-number v-model="scope.row.quantifiedValue"
+                                     :precision="2" :step="0.1" :min="0" :disabled="!scope.row.updateMark" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="单位" prop="unit" />
+                            <el-table-column label="审核状态">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.state" placeholder="请选择审核状态" :disabled="!scope.row.updateMark">
+                                        <el-option
+                                        v-for="item in statusData"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </el-tab-pane>
                     <el-tab-pane label="考评评价指标内容" name="second">
@@ -142,7 +155,7 @@
                             </el-table-column>
                             <el-table-column label="指标名称" prop="childName">
                                 <template #default="scope">
-                                    <el-select v-model="scope.row.childName" placeholder="请选择业务阶段"
+                                    <el-select v-model="scope.row.childName" placeholder="请选择指标名称"
                                     :disabled="!scope.row.showInput"
                                      @change="changeDept">
                                         <el-option
@@ -156,7 +169,7 @@
                             </el-table-column>
                             <el-table-column label="填报部门" prop="deptName" width="260">
                                 <template #default="scope">
-                                    <el-select v-model="scope.row.deptName" placeholder="请选择业务阶段" :disabled="!scope.row.showInput">
+                                    <el-select v-model="scope.row.deptName" placeholder="请选择填报部门" :disabled="!scope.row.showInput">
                                         <el-option
                                         v-for="item in deptNameArr"
                                         :key="item.id"
@@ -166,9 +179,26 @@
                                     </el-select>
                                 </template>
                             </el-table-column>
+                            <el-table-column label="指标项" prop="optionName">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.optionName" disabled />
+                                </template>
+                            </el-table-column>
                             <el-table-column label="计划值">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.nonQuantifiedValue" />
+                                    <el-input v-model="scope.row.nonQuantifiedValue" :disabled="!scope.row.updateMark" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="审核状态">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.state" placeholder="请选择审核状态" :disabled="!scope.row.updateMark">
+                                        <el-option
+                                        v-for="item in statusData"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -214,10 +244,25 @@ export default {
             saveIcon: saveIcon,
             editIcon: editIcon,
             deleteIcon: deleteIcon,
-            rowMsg: {}
+            rowMsg: {},
+            statusData: []
         }
     },
     created() {
+        this.statusData = [
+            {
+                name: '已完成',
+                id: '1'
+            },
+            {
+                name: '待审核',
+                id: '0'
+            },
+            {
+                name: '未开始',
+                id: '-1'
+            }
+        ]
     },
     methods: {
         init(row) {
@@ -253,11 +298,11 @@ export default {
             apiGetOrgEvalInfoList(params).then(datas =>{
                 if (datas && datas.data) {
                     that.quantifiedList = datas.data.quantifiedList
-                    if (datas.data.nonQuantifiedList.length>0) {
-                        datas.data.nonQuantifiedList.forEach(it =>{
-                            it.childName = it.organizationName //指标id
-                        })
-                    }
+                    // if (datas.data.nonQuantifiedList.length>0) {
+                    //     datas.data.nonQuantifiedList.forEach(it =>{
+                    //         it.childName = it.indicatorId //指标id
+                    //     })
+                    // }
                     that.nonQuantifiedList = datas.data.nonQuantifiedList.length>0?datas.data.nonQuantifiedList:[]
                 }
             })
@@ -305,6 +350,7 @@ export default {
         },
         changeIndic(val, row) {
             if (row.stageName !== '' && row.sectionName !== '') {
+                row.childName = ''
                 this.getIndListAll(row)
             }
         },
@@ -343,7 +389,7 @@ export default {
                 optionName: '',
                 nonQuantifiedValue: ''
             }
-            this.nonQuantifiedList.push(obj)
+            this.nonQuantifiedList.unshift(obj)
         },
         saveDetail() {
             let that = this
@@ -353,7 +399,8 @@ export default {
                     let obj = {
                         id: item.id,
                         isQuantified: '是',
-                        quantifiedValue: item.quantifiedValue
+                        quantifiedValue: item.quantifiedValue,
+                        state: item.state
                     }
                     params.push(obj)
                 })
@@ -363,15 +410,16 @@ export default {
                         isQuantified: '否',
                         quantifiedValue: 0.0,
                         optionCode: 'ZRMB', // 指标项
-                        nonQuantifiedValue: item.nonQuantifiedValue
+                        nonQuantifiedValue: item.nonQuantifiedValue,
+                        state: item.state,                        
+                        organizationEvaluationId: that.rowMsg.id
                     }
                     if (item.showInput) {
-                        obj.deptResponsibilityId = that.rowMsg.id
                         obj.organizationEvaluationRuleId = item.organizationName //单位id
                         obj.indicatorId = item.childName //指标id
                         
                     } else {
-                        obj.deptResponsibilityId = item.id
+                        obj.id = item.id
                         obj.organizationEvaluationRuleId = item.organizationEvaluationRuleId
                         obj.indicatorId = item.indicatorId
                     }

src/components/assessment/monthQuarterPage.vue

@@ -539,7 +539,7 @@ export default {
         .monthQuarterTableData{
             .el-table{
                 .el-table__body-wrapper{
-                    height: 64vh !important;
+                    height: 60vh !important;
                 }
                 .el-input__inner{
                     height: 30px !important;

src/components/evaluationSystem/achievementKPage.vue

@@ -732,35 +732,34 @@ export default {
                 }
             }
         }
-    }
-  .achievementTableData{
-    .el-table{
-        .el-table__body-wrapper{
-            height: 58vh !important;
-        }
-        .el-input__inner{
-            height: 30px !important;
-        }
-        .el-radio__label{
-            display: none;
-        }
-        
-        .indicitem{
-            color: #409EFF;
-            font-size: 12px;
-            margin-right: 20px;
-            cursor:pointer;
-            &:hover{
-                text-decoration: underline;
+        .achievementTableData{
+            .el-table{
+                .el-table__body-wrapper{
+                    height: 60vh !important;
+                }
+                .el-input__inner{
+                    height: 30px !important;
+                }
+                .el-radio__label{
+                    display: none;
+                }
+                
+                .indicitem{
+                    color: #409EFF;
+                    font-size: 12px;
+                    margin-right: 20px;
+                    cursor:pointer;
+                    &:hover{
+                        text-decoration: underline;
+                    }
+                }
+            }
+            .el-pagination{
+                margin-top: 20px;
+                text-align: end;
+                position: relative;
             }
         }
     }
-    .el-pagination{
-        margin-top: 20px;
-        text-align: end;
-        position: relative;
-    }
-    }
-    
 }
 </style>

src/components/evaluationSystem/evaluationCompanyPage.vue

@@ -593,7 +593,7 @@ export default {
   .evaluationCompanyTableData{
     .el-table{
         .el-table__body-wrapper{
-            height: 64vh !important;
+            height: 60vh !important;
         }
         .el-input__inner{
             height: 30px !important;

src/components/evaluationSystem/evaluationDepartmentPage.vue

@@ -416,9 +416,14 @@ export default {
                 .exceed{
                     display: flex;
                     .exceedSpan{
-                        margin-top: 3px;
                         width: 100px;
-                        display: inline-block;
+                        height: 12px;
+                        font-size: 14px;
+                        font-family: Microsoft YaHei;
+                        font-weight: 400;
+                        color: #8991B0;
+                        line-height: 12px;
+                        margin-top: 10px;
                     }
                     .el-input{
                         margin-right:10px;
@@ -479,7 +484,7 @@ export default {
   .evaluationDepartmentTableData{
     .el-table{
         .el-table__body-wrapper{
-            height: 64vh !important;
+            height: 60vh !important;
         }
         .el-input__inner{
             height: 30px !important;

src/components/evaluationSystem/evaluationIndexPage.vue

@@ -6,6 +6,17 @@
                     <span class="exceedSpan">指标名称：</span>
                     <el-input v-model="indicatorIdS" placeholder="请输入指标名称"></el-input>
                 </div>
+                <div class="exceed">
+                    <span class="exceedSpan" style="width: 80px">业务属性：</span>
+                    <el-select v-model="binSectionIds" placeholder="请选择业务属性">
+                        <el-option
+                        v-for="item in moduleData"
+                        :key="item.id"
+                        :label="item.sectionName"
+                        :value="item.id">
+                        </el-option>
+                    </el-select>
+                </div>
                 <el-button type="primary" style="margin-left: 10px;" @click="getSeachData">搜索</el-button>
                 <el-button style="margin-left: 10px;" @click="resetSeach">重置</el-button>
             </div>
@@ -146,21 +157,17 @@
                             </el-form>
                         </el-col>
                         <el-col :span="16" class="indicatorItemBtn">
-                            <div class="PeriodBtn">
-                                <el-row :gutter="10" style="padding-left: 10px;">
-                                    <p class="indItemC">指标项配置管理</p>
-                                    <el-col :span="1.5">
-                                        <el-button
-                                        type="primary"
-                                        size="mini"
-                                        :disabled="ruleForm.isChild === '否' || isDetail"
-                                        @click="handleAddChild"
-                                        >
-                                        <img :src="addW" style="margin-right: 10px">
-                                        <span>新增</span>
-                                        </el-button>
-                                    </el-col>
-                                </el-row>
+                            <div class="PeriodBtnDia">
+                                <p class="indItemC">指标项配置管理</p>
+                                <el-button
+                                type="primary"
+                                size="mini"
+                                :disabled="ruleForm.isChild === '否' || isDetail"
+                                @click="handleAddChild"
+                                >
+                                <img :src="addW" style="margin-right: 10px">
+                                <span>新增</span>
+                                </el-button>
                             </div>
                             <div class="indicatorItemTableData">
                                 <div class="datasMsg" v-if="indicatoroptions.length>0" >
@@ -255,6 +262,7 @@ export default {
             isSave: false,
             changeDateSelect: [],
             indicatorIdS: '',
+            binSectionIds: '',
             evaluationIndexData:[],
             moduleData: [],
             stageData: [],
@@ -335,6 +343,7 @@ export default {
             }
             if (type) {
                 params.indicatorName = that.indicatorIdS
+                params.binSection = that.binSectionIds
             }
             apiGetIndicatorList(params).then(datas =>{
                 if (datas && datas.data) {
@@ -692,15 +701,15 @@ export default {
                             }
                         }
                     }
-                }
-                .el-select{
-                    margin-right:10px;
-                    .el-input__inner, .is-disabled{
-                        height:30px !important;
-                    }
-                    .el-input__suffix{
-                        .el-select__caret{
-                            line-height:30px;
+                    .el-select{
+                        line-height: 40px !important;
+                        .el-input__inner, .is-disabled{
+                            height:40px !important;
+                        }
+                        .el-input__suffix{
+                            .el-select__caret{
+                                line-height:40px;
+                            }
                         }
                     }
                 }
@@ -748,13 +757,13 @@ export default {
                                 span{
                                     font-size:14px;
                                 }
-                                .PeriodBtn{
+                                .PeriodBtnDia{
                                     display: flex;
-                                    justify-content: end;
+                                    justify-content: space-between;
                                     padding: 20px 0;
                                     .indItemC{
                                         position: relative;
-                                        left: -600px;
+                                        // left: -600px;
                                         top: 15px;
                                         font-size: 16px;
                                         font-family: Microsoft YaHei;
@@ -877,7 +886,7 @@ export default {
   .evaluationIndexTableData{
     .el-table{
         .el-table__body-wrapper{
-            height: 64vh !important;
+            height: 60vh !important;
         }
         .el-input__inner{
             height: 30px !important;

src/components/evaluationSystem/evaluationPersonnelPage.vue

@@ -585,7 +585,7 @@ export default {
   .evaluationPersonTableData{
     .el-table{
         .el-table__body-wrapper{
-            height: 64vh !important;
+            height: 60vh !important;
         }
         .el-input__inner{
             height: 30px !important;

src/components/evaluationSystem/evaluationRulesPage.vue

@@ -3,8 +3,15 @@
         <div class="evaluationRuleBtn">
             <div class="collectSeach">
                 <div class="exceed">
-                    <span class="exceedSpan">业务属性：</span>
-                    <el-input v-model="moduleStr" placeholder="请输入业务属性"></el-input>
+                    <span class="exceedSpan" style="width: 80px">业务属性：</span>
+                    <el-select v-model="moduleStr" placeholder="请选择业务属性">
+                        <el-option
+                        v-for="item in moduleData"
+                        :key="item.id"
+                        :label="item.sectionName"
+                        :value="item.id">
+                        </el-option>
+                    </el-select>
                 </div>
                 <el-button type="primary" style="margin-left: 10px;" @click="getSeachData">搜索</el-button>
                 <el-button style="margin-left: 10px;" @click="resetSeach">重置</el-button>
@@ -334,14 +341,14 @@ export default {
                         line-height: 12px;
                         margin-top: 10px;
                     }
-                    .el-input{
-                        margin-right:10px;
-                        .el-input__inner{
-                            height:30px;
+                    .el-select{
+                        line-height: 40px !important;
+                        .el-input__inner, .is-disabled{
+                            height:40px !important;
                         }
                         .el-input__suffix{
                             .el-select__caret{
-                                line-height:30px;
+                                line-height:40px;
                             }
                         }
                     }
@@ -393,7 +400,7 @@ export default {
   .evaluationRuleTableData{
     .el-table{
         .el-table__body-wrapper{
-            height: 64vh !important;
+            height: 60vh !important;
         }
         .el-input__inner{
             height: 30px !important;

src/components/evaluationSystem/partyBuildingKPage.vue

@@ -20,9 +20,9 @@
                 <btns
                 :showImport="false"
                 :showExport="false"
-                :showAdd="$utils.havePurview('achieveK:oneLevel:add')"
-                :showSave="$utils.havePurview('achieveK:oneLevel:save')"
-                :showDelete="$utils.havePurview('achieveK:oneLevel:delete')"
+                :showAdd="$utils.havePurview('partBuildK:oneLevel:add')"
+                :showSave="$utils.havePurview('partBuildK:oneLevel:save')"
+                :showDelete="$utils.havePurview('partBuildK:oneLevel:delete')"
                 :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"
@@ -403,7 +403,7 @@ export default {
         .partyBuildingTableData{
             .el-table{
                 .el-table__body-wrapper{
-                    height: 58vh !important;
+                    height: 60vh !important;
                 }
                 .el-input__inner{
                     height: 30px !important;

src/components/gatewayPage.vue

@@ -488,7 +488,7 @@ export default {
         }
     }
     .gateway_bot{
-        padding: 24px 0 16px 26px;
+        padding: 15px 0 16px 26px;
         .gateway_bot_left{
             background: #fff;
             margin-right: 30px;
@@ -497,7 +497,7 @@ export default {
             padding-bottom: 10px;
             border: 1px solid #E1E3EA;
             .bot_leftTit{
-                padding: 21px 0 30px 0;
+                padding: 21px 0 10px 0;
                 display: flex;
                 justify-content: space-between;
                 p{
@@ -513,6 +513,8 @@ export default {
             }
             .bot_leftMain{
                 height: 62vh !important;
+                overflow: auto;
+                padding-top: 20px;
                 .mainImg{
                     position: relative;
                     top: -3px;
@@ -571,7 +573,7 @@ export default {
             margin-right: 30px;
             border-radius: 10px;
             padding: 0 25px;
-            padding-bottom: 28px;
+            padding-bottom: 10px;
             border: 1px solid #E1E3EA;
             .bot_Tit{
                 padding: 21px 0 10px 0;
@@ -590,7 +592,7 @@ export default {
             }
             .el-table{
                 .el-table__body-wrapper{
-                    height: 57vh !important;
+                    height: 59vh !important;
                 }
             }
         }
@@ -598,7 +600,7 @@ export default {
             background: #fff;
             margin-right: 30px;
             border-radius: 10px;
-            padding-bottom: 25px;
+            padding-bottom: 10px;
             border: 1px solid #D6DBEA;
             .bot_rightTit{
                 padding: 21px 25px 10px 25px;
@@ -612,7 +614,7 @@ export default {
                 }
             }
             .bot_rightMain{
-                height: 63vh !important;
+                height: 65vh !important;
                 overflow-y: auto;
                 .bot_rightMain_msg{
                     display: flex;

src/components/knowledgePage/scoringRulesPage.vue

@@ -405,7 +405,7 @@ export default {
     .scoringRulesTableData{
         .el-table{
             .el-table__body-wrapper{
-                height: 64vh !important;
+                height: 60vh !important;
             }
             .el-input__inner{
                 height: 30px !important;

src/components/taskCenter/taskCenterEvlFrom.vue

@@ -46,10 +46,10 @@
                     </el-col>
                 </el-row>
                 <div class="detaTableBtns">
-                    <!-- <div class="tableBtn add">
+                    <div class="tableBtn add" @click="addTableDetail" v-if="activeName === 'second'">
                         <img :src="addIcon" alt="">
                         <span>新增</span>
-                    </div> -->
+                    </div>
                     <div class="tableBtn save" @click="saveDetail">
                         <img :src="saveIcon" alt="">
                         <span>保存</span>
@@ -76,25 +76,146 @@
                             <el-table-column label="指标项" prop="optionName" v-if="instanceChild.defKey === 'yddwkplc'" />
                             <el-table-column label="计划值" width="150">
                                 <template #default="scope">
-                                    <el-input-number v-model="scope.row.quantifiedValue" :precision="2" :step="0.1" :min="1" />
+                                    <el-input-number v-model="scope.row.quantifiedValue"
+                                     :precision="2" :step="0.1" :min="1" :disabled="!scope.row.updateMark"/>
                                 </template>
                             </el-table-column>
                             <el-table-column label="单位" prop="unit" />
+                             <el-table-column label="审核状态">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.state" placeholder="请选择审核状态" :disabled="!scope.row.updateMark">
+                                        <el-option
+                                        v-for="item in statusData"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </el-tab-pane>
                     <el-tab-pane label="考评评价指标内容" name="second">
                         <el-table :data="nonQuantifiedList" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
-                            <el-table-column label="业务类别" prop="stageName" />
-                            <el-table-column label="所属板块" prop="sectionName" />
+                            <el-table-column label="单位名称" prop="organizationName" width="300">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.organizationName" placeholder="请选择单位名称"
+                                    :disabled="!scope.row.showInput"
+                                     @change="changeOrgZa">
+                                        <el-option
+                                        v-for="item in orgruleData"
+                                        :key="item.id"
+                                        :label="item.organizationName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="指标分类" prop="typeName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.typeName" :disabled="!scope.row.showInput" placeholder="请选择指标分类">
+                                        <el-option
+                                        v-for="item in indicatorTypeData"
+                                        :key="item.id"
+                                        :label="item.typeName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="业务阶段" prop="stageName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.stageName" placeholder="请选择业务阶段"
+                                    :disabled="!scope.row.showInput"
+                                     @change="(val)=>changeIndic(val, scope.row)">
+                                        <el-option
+                                        v-for="item in stageData"
+                                        :key="item.id"
+                                        :label="item.stageName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="业务属性" prop="sectionName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.sectionName" placeholder="请选择业务阶段"
+                                    :disabled="!scope.row.showInput"
+                                     @change="(val)=>changeIndic(val, scope.row)">
+                                        <el-option
+                                        v-for="item in sectionNameArr"
+                                        :key="item.id"
+                                        :label="item.secName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="指标名称" prop="childName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.childName" placeholder="请选择业务阶段"
+                                    :disabled="!scope.row.showInput"
+                                     @change="changeDept">
+                                        <el-option
+                                        v-for="item in indicItemoptions"
+                                        :key="item.id"
+                                        :label="item.indicatorName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="填报部门" prop="deptName" width="260">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.deptName" placeholder="请选择业务阶段" :disabled="!scope.row.showInput">
+                                        <el-option
+                                        v-for="item in deptNameArr"
+                                        :key="item.id"
+                                        :label="item.deptName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="指标项" prop="optionName">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.optionName" disabled />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="目标值">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.nonQuantifiedValue"
+                                     :disabled="(taskDefKey === 'nddwkplc' && scope.row.showInput) || !scope.row.updateMark" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="审核状态">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.state" placeholder="请选择审核状态" :disabled="!scope.row.updateMark">
+                                        <el-option
+                                        v-for="item in statusData"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </el-tab-pane>
+                    <!-- $utils.havePurview('taskList:twoLevel:see') -->
+                    <el-tab-pane label="查看得分" name="three">
+                        <el-table :data="pointList" style="width: 100%">
+                            <el-table-column type="index" label="序号" width="80" />
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
-                            <el-table-column label="填报部门" prop="deptName" width="260" />                                
-                            <el-table-column label="指标分类" prop="typeName" />
-                            <el-table-column label="指标名称" prop="childName" v-if="instanceChild.defKey === 'yddwkplc'" />
-                            <el-table-column label="指标项" prop="optionName" v-if="instanceChild.defKey === 'yddwkplc'" />
-                            <el-table-column label="计划值" width="150">
+                            <el-table-column label="部门名称" prop="keyName" />
+                            <el-table-column label="指标名称" prop="indicatorName" />
+                            <el-table-column label="业务类别"  prop="stageName" width="260" />
+                            <el-table-column label="所属板块" prop="sectionName" />
+                            <el-table-column label="计算得分" prop="score" />
+                            <el-table-column label="折算得分" prop="obversionScore" >
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.nonQuantifiedValue" />
+                                    <el-input-number v-model="scope.row.obversionScore" :precision="2" :step="0.1" :min="0" />
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -116,7 +237,9 @@
 </template>
 
 <script>
-import {apiGettaskevalStartDetail,apiGettaskmothAyearDetail,apiGetindicatorsaveBatchDto, apiPostIsdoAction, apiPostgetInstanceAndChildren} from '../../api/api'
+import {apiGettaskevalStartDetail,apiGettaskmothAyearDetail,apiGetindicatorsaveBatchDto, 
+apiPostIsdoAction, apiPostgetInstanceAndChildren, apiGetindicatorListAll,apiGetscoreCountList,apiPostScoreCountSave,
+ apiGetOrganizationRule, apiGetbinstageList, apiGetIndicatorTypeList, apiGetOrgEvaInfoBatchDto} from '../../api/api'
 import addIcon from '../../assets/btnIcon/add.png'
 import saveIcon from '../../assets/btnIcon/save.png'
 import editIcon from '../../assets/btnIcon/edit.png'
@@ -129,6 +252,7 @@ export default {
             activeName: 'first',
             quantifiedList: [],
             nonQuantifiedList: [],
+            pointList: [],
             changeDateSelect: [],
             receiptMsg: {
                 code: '',
@@ -146,10 +270,33 @@ export default {
             deleteIcon: deleteIcon,
             rowMsg: {},
             descMsg: '',
-            instanceChild: {}
+            instanceChild: {},
+            orgruleData: [],
+            indicatorTypeData: [],
+            stageData: [],
+            sectionNameArr: [],
+            indicItemoptions: [],
+            deptNameArr: [],
+            statusData: [],
+            taskDefKey: '',
+            tastbizKey: ''
         }
     },
     created() {
+        this.statusData = [
+            {
+                name: '已完成',
+                id: '1'
+            },
+            {
+                name: '待审核',
+                id: '0'
+            },
+            {
+                name: '未开始',
+                id: '-1'
+            }
+        ]
     },
     methods: {
         init(row) {
@@ -158,11 +305,24 @@ export default {
             this.instanceChild = {}
             this.descMsg = ''
             this.getTaskId(row)
+            this.getindList()
             this.rowMsg = row
         },
         handleClick() {
             this.changeDateSelect = []
         },
+        // 获取得分数据
+        getPointData(id) {
+            let that = this
+            let params = {
+                organizationEvaluationId: id
+            }
+            apiGetscoreCountList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.pointList = datas.data
+                }
+            })
+        },
         // 根据流程ID获取业务ID
         getTaskId(row) {
             let that = this
@@ -174,7 +334,10 @@ export default {
                 if (datas && datas.data) {
                     that.instanceChild = datas.data.data.bpmInstance
                     let keyId = datas.data.data.bpmInstance.bizKey
+                    that.tastbizKey = datas.data.data.bpmInstance.bizKey
+                    that.taskDefKey = datas.data.data.bpmInstance.defKey
                     that.getevalStartDetails(keyId, that.instanceChild.defKey)
+                    that.getOrgRule(keyId, that.instanceChild.defKey)
                 }
             })
         },
@@ -193,6 +356,36 @@ export default {
                     that.getDataMsg('dwkpmbqd', datas)
                 })
             }
+            that.getPointData(id)
+        },
+        getindList() {
+            let that = this
+            let params = {
+                type: 2
+            }
+            apiGetbinstageList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.stageData = datas.data
+                }
+            })
+            apiGetIndicatorTypeList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.indicatorTypeData = datas.data
+                }
+            })
+        },
+        // 考评评价指标内容
+        getOrgRule(id, type) {
+            let that = this
+            let params = {
+                id: id,
+                type: type === 'dwkpmbqd' ? 'mb' :  'kp'
+            }
+            apiGetOrganizationRule(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.orgruleData = datas.data
+                }
+            })
         },
         getDataMsg(type, datas) {
             if (datas && datas.data) {
@@ -211,6 +404,60 @@ export default {
                 this.nonQuantifiedList = item.map.nonQuantifiedList
             }
         },
+        changeOrgZa(val) {
+            this.sectionNameArr = []
+            this.orgruleData.forEach(item =>{
+                if (item.id === val) {
+                    let obj = {
+                        id: item.binSection,
+                        secName: item.binSectionName
+                    }
+                    this.sectionNameArr.push(obj)
+                }
+            })
+        },
+        changeIndic(val, row) {
+            if (row.stageName !== '' && row.sectionName !== '') {
+                this.getIndListAll(row)
+            }
+        },
+        changeDept(val) {
+            this.deptNameArr = []
+            this.indicItemoptions.forEach(item =>{
+                if (item.id === val) {
+                    let obj = {
+                        id: item.dept,
+                        deptName: item.deptName
+                    }
+                    this.deptNameArr.push(obj)
+                }
+            })
+        },
+        getIndListAll(row) {
+            let that = this
+            let params = {
+                binSection: row.sectionName,
+                binStage: row.stageName
+            }
+            apiGetindicatorListAll(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.indicItemoptions = datas.data
+                }
+            })
+        },
+        addTableDetail() {
+            let obj = {
+                showInput: true,
+                stageName: '',
+                sectionName: '',
+                organizationName: '',
+                deptName: '',
+                typeName: '',
+                optionName: '',
+                nonQuantifiedValue: ''
+            }
+            this.nonQuantifiedList.unshift(obj)
+        },
         saveDetail() {
             let that = this
             let params = []
@@ -219,29 +466,76 @@ export default {
                     let obj = {
                         id: item.id,
                         isQuantified: '是',
-                        quantifiedValue: item.quantifiedValue
+                        quantifiedValue: item.quantifiedValue,
+                        state: item.state
                     }
                     params.push(obj)
                 })
-            } else {
+            } else if(that.activeName === 'second') {
                 that.nonQuantifiedList.forEach(item =>{
                     let obj = {
-                        id: item.id,
                         isQuantified: '否',
-                        nonQuantifiedValue: item.nonQuantifiedValue
+                        quantifiedValue: 0.0,
+                        optionCode: 'ZRMB', // 指标项
+                        nonQuantifiedValue: item.nonQuantifiedValue,
+                        state: item.state
+                    }
+                    if (that.taskDefKey === 'dwkpmbqd') {
+                        obj.deptResponsibilityId = that.tastbizKey
+                    } else  {
+                        obj.organizationEvaluationId = that.tastbizKey
+                    }
+                    if (item.showInput) {
+                        obj.organizationEvaluationRuleId = item.organizationName //单位id
+                        obj.indicatorId = item.childName //指标id
+                        
+                    } else {
+                        obj.id = item.id
+                        obj.organizationEvaluationRuleId = item.organizationEvaluationRuleId
+                        obj.indicatorId = item.indicatorId
+                    }
+                    params.push(obj)
+                })
+            } else {
+                that.pointList.forEach(item =>{
+                    let obj = {
+                        id: item.id,
+                        obversionScore: item.obversionScore
                     }
                     params.push(obj)
                 })
             }
-            apiGetindicatorsaveBatchDto(params).then(datas =>{
-                if (datas && datas.success) {
-                    that.$message({
+            if (that.activeName === 'first' || that.activeName === 'second') {
+                if (that.taskDefKey === 'dwkpmbqd') {
+                    apiGetindicatorsaveBatchDto(params).then(datas =>{
+                        that.getsaveDataMsg(datas)
+                    })
+                } else {
+                    apiGetOrgEvaInfoBatchDto(params).then(datas =>{
+                        that.getsaveDataMsg(datas)
+                    })
+                }
+            } else {
+                apiPostScoreCountSave(params).then(datas =>{
+                    that.getsaveDataMsg(datas)
+                })
+            }
+        },
+        getsaveDataMsg(datas) {
+            if (datas) {
+                if (datas.success) {
+                    this.$message({
                         message: '保存成功',
                         type: 'success'
                     });
-                    that.getDetails(that.rowMsg.id)
+                    this.getevalStartDetails(this.tastbizKey, this.taskDefKey)
+                } else {
+                    this.$message({
+                        message: datas.data,
+                        type: 'error'
+                    })
                 }
-            })
+            }
         },
         examineAndApprove(type) {
             let that = this
@@ -364,7 +658,7 @@ export default {
                             }
                         }
                         .add{
-                            cursor: no-drop;
+                            cursor: pointer;
                             span{
                                 color: #3B7AD1;
                             }

src/components/taskCenter/taskCenterPage.vue

@@ -134,7 +134,7 @@ export default {
         margin-top: 20px;
         .el-table{
             .el-table__body-wrapper{
-                height: 80vh !important;
+                height: 78vh !important;
             }
             .el-input__inner{
                 height: 30px !important;

src/utils/baseUrl.js

@@ -11,12 +11,14 @@ switch (process.env.NODE_ENV) {
         baseUrl.ROOT = "/api"  //开发环境url
         // baseUrl.URL = "http://10.65.59.67:28800"
         // baseUrl.URL = "http://123.60.219.66:28800"
-        baseUrl.URL = "http://10.65.78.23:28800"
+        baseUrl.URL = "http://10.65.78.23:28800"  //测试环境
+        // baseUrl.URL = "http://10.65.78.81:28800"  // 正式环境
         break
  
     case 'production': 
-        // baseUrl.ROOT = "http://123.60.219.66:28800/"
-        baseUrl.ROOT = "http://10.65.78.23:28800/"
+        // baseUrl.ROOT = "http://123.60.219.66:28800/" 
+        // baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
+        baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
         break 
 }
 

src/views/homePage.vue

@@ -348,7 +348,11 @@ export default {
                                     }
                                 })
                                 if (showM === 0) {
-                                    this.routeTags.push(it)
+                                    let obj = {
+                                        index: it.index,
+                                        name: it.name
+                                    }
+                                    this.routeTags.push(obj)
                                 }
                             } else {
                                 it.children.forEach(iv =>{