Browse Source

部门问题修改

SunZehao 1 year ago
parent
commit
62ff41b74f

+ 7 - 3
src/api/api.js

@@ -154,9 +154,13 @@ export function apiGetevaluationdeptplanSave(params) {
     return httpRequest.post('evaluation-dept-plan/save', params)
 }
 //----"部门考评目标启动-保存or修改"----新增后修改状态
-// export function apideptModifyState(params) {
-//     return httpRequest.post('evaluation-dept-plan/save', params)
-// }
+export function apideptModifyState(params) {
+    return httpRequest.post('evaluation-dept-plan/targetStart', params)
+}
+//----"部门考评指标考核-保存or修改"----新增后修改状态
+export function apideptModifyassessmentState(params) {
+    return httpRequest.post('evaluation-dept-assessment/targetStart', params)
+}
 
 //------考评启动(流程)
 export function apiGetdoAction(params) {

+ 3 - 9
src/components/assessment/evaluationDeptBusinessFrom.vue

@@ -86,7 +86,7 @@
                             <el-table-column label="完成情况" width="300">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.completionStatus"
-                                     type="textarea" :rows="2" placeholder="请输入完成情况" :disabled="!scope.row.updateMark"></el-input>
+                                     type="textarea" :rows="2" placeholder="请输入完成情况"></el-input>
                                 </template>
                             </el-table-column>
                             <el-table-column label="评价标准" prop="evaluationCriteria" />
@@ -97,8 +97,7 @@
                             </el-table-column>
                             <el-table-column label="审核状态" width="200" >
                                 <template #default="scope">
-                                     <!-- :disabled="!scope.row.updateMark" -->
-                                    <el-select v-model="scope.row.auditStatus" :disabled="!scope.row.updateMark" placeholder="请选择审核状态">
+                                    <el-select v-model="scope.row.auditStatus" placeholder="请选择审核状态">
                                         <el-option
                                         v-for="item in statusData"
                                         :key="item.id"
@@ -331,7 +330,7 @@ export default {
             this.getDetails(this.rowMsg.id)
         },
         handleExport() {
-            let data = []  //接口返回数据
+            let data = this.quantifiedList  //接口返回数据
             const workbook = new ExcelJS.Workbook()
             const worksheet = workbook.addWorksheet('Sheet1')
             //根据数据自己调整
@@ -350,11 +349,6 @@ export default {
                 { header: '评价标准', key: 'evaluationCriteria', width: 18 },
                 { header: '自评得分', key: 'evaluationScore', width: 18 }
             ]
-            this.quantifiedList.forEach(item =>{
-                if (item.updateMark) {
-                    data.push(item)
-                }
-            })
             worksheet.columns = colums
             worksheet.getRow(1).font = {
                 size: 12,

+ 17 - 1
src/components/assessment/evaluationDeptBusinessPage.vue

@@ -69,7 +69,8 @@
 import businessFromList from './evaluationDeptBusinessFrom.vue'
 import btns from '../elbuttonS.vue'
 import { saveAs } from 'file-saver'
-import {apiGetevaluationdeptassessmentlist, apiGetdoAction, apiGetevaluationgenerateReport,apiGetevaluationdownloadReport} from '../../api/api'
+import {apiGetevaluationdeptassessmentlist, apiGetdoAction, apideptModifyassessmentState,
+apiGetevaluationgenerateReport,apiGetevaluationdownloadReport} from '../../api/api'
 export default {
     components: {
         businessFromList,
@@ -123,6 +124,21 @@ export default {
                             message: datas.data.msg,
                             type: 'error'
                         });
+                    } else {
+                        let params = {
+                            id: row.id,
+                            stage: '流程已开始'
+                        }
+                        apideptModifyassessmentState(params).then(values =>{
+                            if (values.success) {
+                                that.getevaluBusinessList()
+                            } else {
+                                that.$message({
+                                    message: values.message,
+                                    type: 'error'
+                                });
+                            }
+                        })
                     }
                 }
             })

+ 6 - 16
src/components/assessment/evaluationDeptStartFrom.vue

@@ -86,22 +86,19 @@
                             <el-table-column label="排序" width="100" >
                                 <template #default="scope">
                                     <el-input v-model="scope.row.serialNumber"
-                                     placeholder="请输入排序" :disabled="!scope.row.updateMark"></el-input>
+                                     placeholder="请输入排序"></el-input>
                                 </template>
                             </el-table-column>
                             <el-table-column label="指标名称" >
                                 <template #default="scope">
                                     <el-input v-model="scope.row.targetName"
-                                     placeholder="请输入指标名称" :disabled="!scope.row.updateMark"></el-input>
+                                     placeholder="请输入指标名称"></el-input>
                                 </template>
                             </el-table-column>
                             <el-table-column label="目标值" width="500">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.targetValue"
-                                     type="textarea" :rows="2" placeholder="请输入目标值" :disabled="!scope.row.updateMark"></el-input>
-                                    <!-- <el-input-number v-model="scope.row.targetValue"
-                                     :precision="2" :step="0.1" :min="0" /> -->
-                                     <!-- :disabled="!scope.row.updateMark"  -->
+                                     type="textarea" :rows="2" placeholder="请输入目标值"></el-input>
                                 </template>
                             </el-table-column>
                             <el-table-column label="基础分" width="150">
@@ -112,13 +109,12 @@
                             <el-table-column label="评价标准" >
                                 <template #default="scope">
                                     <el-input v-model="scope.row.evaluationCriteria"
-                                     placeholder="请输入评价标准" :disabled="!scope.row.updateMark"></el-input>
+                                     placeholder="请输入评价标准"></el-input>
                                 </template>
                             </el-table-column>
                             <el-table-column label="审核状态" width="200" >
                                 <template #default="scope">
-                                     <!-- :disabled="!scope.row.updateMark" -->
-                                    <el-select v-model="scope.row.auditStatus" :disabled="!scope.row.updateMark" placeholder="请选择审核状态">
+                                    <el-select v-model="scope.row.auditStatus" placeholder="请选择审核状态">
                                         <el-option
                                         v-for="item in statusData"
                                         :key="item.id"
@@ -278,7 +274,6 @@ export default {
         addTableDetail() {
             let obj = {
                 showInput: true,
-                updateMark: true,
                 businessPlanId: this.rowMsg.id,
                 serialNumber: '1',
                 deptName: '',
@@ -381,7 +376,7 @@ export default {
             this.getDetails(this.rowMsg.id)
         },
         handleExport() {
-            let data = []  //接口返回数据
+            let data = this.quantifiedList  //接口返回数据
             const workbook = new ExcelJS.Workbook()
             const worksheet = workbook.addWorksheet('Sheet1')
             //根据数据自己调整
@@ -398,11 +393,6 @@ export default {
                 { header: '基础分', key: 'baseScore', width: 18 },
                 { header: '评价标准', key: 'evaluationCriteria', width: 18 }
             ]
-            this.quantifiedList.forEach(item =>{
-                if (item.updateMark) {
-                    data.push(item)
-                }
-            })
             worksheet.columns = colums
             worksheet.getRow(1).font = {
                 size: 12,

+ 15 - 6
src/components/assessment/evaluationDeptStartPage.vue

@@ -162,7 +162,7 @@
 import startFromList from './evaluationDeptStartFrom.vue'
 import btns from '../elbuttonS.vue'
 import {apiGetevaluatiodeptplanList, apiGetevaluationdeptplanSave,apiGetdoAction,apiGetworkflowgetOpinion,
-apiGetdeptresponsibilitygenerate, apiGetdatadictionaryList, apiPostevaluationdeptplanDelete} from '../../api/api'
+apideptModifyState, apiGetdatadictionaryList, apiPostevaluationdeptplanDelete} from '../../api/api'
 export default {
     components: {
         startFromList,
@@ -371,11 +371,20 @@ export default {
                             type: 'error'
                         });
                     } else {
-                        // deptModifyState().then(values =>{
-                        //     if (values) {
-                        //         that.getevaluStartList()
-                        //     }
-                        // })
+                        let params = {
+                            id: row.id,
+                            stage: '流程已开始'
+                        }
+                        apideptModifyState(params).then(values =>{
+                            if (values.success) {
+                                that.getevaluStartList()
+                            } else {
+                                that.$message({
+                                    message: values.message,
+                                    type: 'error'
+                                });
+                            }
+                        })
                     }
                 }
             })