测试环境配置新增页面菜单；任务中心新增部门计划详情与部门指标考核详情页面并增加审批流程，修改问题及缺陷；

src/api/api.js

@@ -153,6 +153,10 @@ export function apiGetdeptresponsibilitySave(params) {
 export function apiGetevaluationdeptplanSave(params) {
     return httpRequest.post('evaluation-dept-plan/save', params)
 }
+//----"部门考评目标启动-修改简述使用的服务"
+export function apiGetevaluationdeptplanModify(params) {
+    return httpRequest.post('evaluation-dept-plan/modify', params)
+}
 //----"部门考评目标启动-保存or修改"----新增后修改状态
 export function apideptModifyState(params) {
     return httpRequest({

src/components/assessment/evaluationDeptBusinessPage.vue

@@ -20,23 +20,21 @@
                     <el-table-column label="考评年度" prop="appraisalYear" width="200" />
                     <el-table-column label="业务简述" prop="des">
                         <template #default="scope">
-                            <div v-if="!scope.row.chngeDes">
-                                <el-tooltip
-                                    class="box-item"
-                                    effect="customized"
-                                    :content="scope.row.des"
-                                    placement="top"
-                                >
-                                    <span class="tooltipCC">{{scope.row.des}}</span>
-                                </el-tooltip>
-                            </div>
-                            <div v-else>
-                                <el-input v-model="scope.row.des" :rows="1" 
-                                type="textarea" placeholder="请输入描述" @blur="modifyDesFn(scope.row)"></el-input>
-                            </div>
+                            <el-tooltip
+                                class="box-item"
+                                effect="customized"
+                                :content="scope.row.des"
+                                placement="top"
+                            >
+                                <span class="tooltipCC">{{scope.row.des}}</span>
+                            </el-tooltip>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="流程状态" prop="stage" width="200">                        
+                        <template #default="scope">
+                            <p class="indicitem" @click="seeStates(scope.row)">{{scope.row.stage}}</p>
                         </template>
                     </el-table-column>
-                    <el-table-column label="流程状态" prop="stage" width="200" />
                     <el-table-column label="操作" width="160">
                         <template #default="scope">
                             <div style="display:flex">
@@ -56,6 +54,20 @@
                     :total="page.total">
                 </el-pagination>
             </div>
+            <el-dialog title="流程详情" v-model="statesVisible" :fullscreen="true" :close-on-click-modal="false">
+                <div class="flowSty">
+                    <el-table :data="stageArr" style="width: 100%">
+                        <el-table-column type="index" label="序号" align="center" />
+                        <el-table-column label="任务名称" prop="taskName" />
+                        <el-table-column label="任务创建时间" prop="createTime" />
+                        <el-table-column label="任务处理时间" prop="approveTime" />
+                        <el-table-column label="候选人" prop="assignInfo" width="500" />
+                        <el-table-column label="执行人" prop="approverName" />
+                        <el-table-column label="处理状态" prop="status" />
+                        <el-table-column label="备注/意见" prop="opinion" />
+                    </el-table>
+                </div>
+            </el-dialog>
         </div>
         <business-from-list ref="businessFromDetail" ></business-from-list>
     </div>
@@ -65,7 +77,7 @@
 import businessFromList from './evaluationDeptBusinessFrom.vue'
 import btns from '../elbuttonS.vue'
 import { saveAs } from 'file-saver'
-import {apiGetevaluationdeptassessmentlist, apiGetdoAction, apideptModifyassessmentState,
+import {apiGetevaluationdeptassessmentlist, apiGetdoAction, apideptModifyassessmentState,apiGetworkflowgetOpinion,
 apiGetevaluationgenerateReport,apiGetevaluationdownloadReport} from '../../api/api'
 export default {
     components: {
@@ -82,6 +94,8 @@ export default {
             },
             rescode: '',
             resDes: '',
+            stageArr: [],
+            statesVisible: false
         }
     },
     created() {
@@ -143,6 +157,30 @@ export default {
         getDetail(row) {
             this.$refs.businessFromDetail.init(row)
         },
+        seeStates(row) {
+            if (!row.instId) {
+                this.$message({
+                    type: 'error',
+                    message: '无法查看流程'
+                });
+            } else {
+                this.statesVisible = true
+                this.getstageData(row.instId)
+            }
+        },
+        // 根据流程id获取业务id
+        getstageData(id) {
+            let that = this
+            let params = {
+                instId: id,
+                iamCode: window.localStorage.getItem('code')
+            }
+            apiGetworkflowgetOpinion(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.stageArr = datas.data.data                    
+                }
+            })
+        },
         getSeachData() {
             this.page.currentPage = 1
             this.getevaluBusinessList()

src/components/assessment/evaluationDeptStartPage.vue

@@ -161,7 +161,7 @@
 <script>
 import startFromList from './evaluationDeptStartFrom.vue'
 import btns from '../elbuttonS.vue'
-import {apiGetevaluatiodeptplanList, apiGetevaluationdeptplanSave,apiGetdoAction,apiGetworkflowgetOpinion,
+import {apiGetevaluatiodeptplanList, apiGetevaluationdeptplanSave,apiGetdoAction,apiGetworkflowgetOpinion,apiGetevaluationdeptplanModify,
 apideptModifyState, apiGetdatadictionaryList, apiPostevaluationdeptplanDelete} from '../../api/api'
 export default {
     components: {
@@ -278,7 +278,11 @@ export default {
         },
         modifyDesFn(row) {
             let that = this
-            apiGetevaluationdeptplanSave(row).then(datas =>{
+            let params = {
+                id: row.id,
+                des: row.des
+            }
+            apiGetevaluationdeptplanModify(params).then(datas =>{
                 if (!datas.success) {
                     that.$message({
                         message: datas.message,

src/components/evaluationknowledgePage/scoringRulesPage.vue

@@ -3,16 +3,20 @@
         <div class="scoringRulesBtn">
             <div class="collectSeach">
                 <div class="exceed">
-                    <span class="exceedSpan">指标名称：</span>
-                    <el-select v-model="indicatorStr" placeholder="请选择指标名称">
+                    <span class="exceedSpan">业务属性：</span>
+                    <el-select v-model="businessStr" placeholder="请选择业务属性" clearable >
                         <el-option
-                        v-for="item in indicItemoptions"
-                        :key="item.indicatorCode"
-                        :label="item.indicatorName"
-                        :value="item.indicatorCode">
+                        v-for="item in binSectionoptions"
+                        :key="item.id"
+                        :label="item.sectionName"
+                        :value="item.id">
                         </el-option>
                     </el-select>
                 </div>
+                <div class="exceed">
+                    <span class="exceedSpan" style="width:100px">规则名称：</span>
+                    <el-input v-model="indicatorStr" placeholder="请输入规则名称"></el-input>
+                </div>
                 <el-button type="primary" style="margin-left: 10px;" @click="getSeachData">搜索</el-button>
                 <el-button style="margin-left: 10px;" @click="reset">重置</el-button>
             </div>
@@ -128,6 +132,7 @@ export default {
             binSectionoptions: [],
             indicatorItems: [],
             indicatorStr: '',
+            businessStr: '',
             rowdataMsg: {},
             changeDateSelect: [],
             isSave: false,
@@ -172,7 +177,8 @@ export default {
             let params = {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
-                indicatorId: that.indicatorStr
+                scoreRuleName: that.indicatorStr,
+                businessPhase: that.businessStr
             }
             apiGetevaluationscoringruleList(params).then(datas =>{
                 if (datas && datas.data) {
@@ -309,6 +315,7 @@ export default {
         reset() {
             this.page.currentPage = 1
             this.indicatorStr = ''
+            this.businessStr = ''
             this.getEvalscoringData()
         },
         handleSizeChange(val){

src/components/taskCenter/taskCenterDeptBusinessFrom.vue

@@ -234,14 +234,15 @@ export default {
             that.quantifiedList = []
             apiGetevaluationdeptassessmentDetailHeader(id).then(datas =>{
                 if (datas && datas.data) {
+                    let item = datas.data
                     this.receiptMsg = {
-                        code: row.responsibilityCode,
-                        des: row.des,
-                        stage: row.stage,
-                        createName: row.createName,
-                        createDate: row.createTime,
-                        type: row.checkCycle === 'YDKP'?'月度考评':row.checkCycle === 'JDKP'?'季度考评':'年度考评',
-                        year: row.appraisalYear,
+                        code: item.responsibilityCode,
+                        des: item.des,
+                        stage: item.stage,
+                        createName: item.createName,
+                        createDate: item.createTime,
+                        type: item.checkCycle === 'YDKP'?'月度考评':item.checkCycle === 'JDKP'?'季度考评':'年度考评',
+                        year: item.appraisalYear,
                         recStage: '有效'
                     }
                 }

src/components/taskCenter/taskCenterDeptStartFrom.vue

@@ -152,7 +152,8 @@
 
 <script>
 import importDailog from '../importPage/importDailog.vue'
-import {apiGetevaluationdeptplanDetail,apiGetevaluationdeptplanUpdate, apiPostIsdoAction, apiGetevaluationdeptplanDetailHeader} from '../../api/api'
+import {apiGetevaluationdeptplanDetail,apiGetevaluationdeptplanUpdate, apiGetdatadictionaryList,
+apiPostIsdoAction, apiGetevaluationdeptplanDetailHeader} from '../../api/api'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
 import addIcon from '../../assets/btnIcon/add.png'
@@ -167,6 +168,7 @@ export default {
     },
     data() {
         return {
+            descMsg: '',
             dialogVisible: false,
             activeName: 'first',
             quantifiedList: [],
@@ -229,9 +231,21 @@ export default {
             this.instanceChild = datas
             this.activeName = 'first'
             this.getDetails(id)
-            this.getshowDepartDataFn(row, deptData)
+            this.getDepartmentFromTreeData(row)
             this.rowMsg = row
-
+        },
+        // 查询部门
+        getDepartmentFromTreeData(row) {
+            let that = this
+            let params = {
+                superKey: 'BM0001'
+            }
+            apiGetdatadictionaryList(params).then(datas =>{
+                if (datas && datas.data) {
+                    let departData = datas.data
+                    that.getshowDepartDataFn(row, departData)
+                }
+            })
         },
         // 整合部门数据
         getshowDepartDataFn(row, deptData) {
@@ -239,7 +253,7 @@ export default {
             deptIdArr.forEach(it =>{
                 deptData.forEach(itv =>{
                     if (itv.id === it) {
-                        this.departData.push(itv)
+                        that.departData.push(itv)
                     }
                 })
             })
@@ -262,14 +276,15 @@ export default {
             that.quantifiedList = []
             apiGetevaluationdeptplanDetailHeader(id).then(datas =>{
                 if (datas && datas.data) {
+                    let item = datas.data
                     this.receiptMsg = {
-                        code: row.responsibilityCode,
-                        des: row.des,
-                        stage: row.stage,
-                        createName: row.createName,
-                        createDate: row.createTime,
-                        type: row.checkCycle === 'YDKP'?'月度考评':row.checkCycle === 'JDKP'?'季度考评':'年度考评',
-                        year: row.appraisalYear,
+                        code: item.responsibilityCode,
+                        des: item.des,
+                        stage: item.stage,
+                        createName: item.createName,
+                        createDate: item.createTime,
+                        type: item.checkCycle === 'YDKP'?'月度考评':item.checkCycle === 'JDKP'?'季度考评':'年度考评',
+                        year: item.appraisalYear,
                         recStage: '有效'
                     }
                 }