浏览代码

单位考评业务与本部考评业务所有相关单据页面修改权限;任务中心里面关于绩效结果考核申报页面,员工月度考核系数与本月主要工作完成情况页面增加功能按钮(新增,保存,删除,导入与导出);

SunZehao 1 年之前
父节点
当前提交
3824f1b42e

+ 23 - 23
src/components/assessment/assessmentApplicationFrom.vue

@@ -118,7 +118,7 @@
                             </el-table-column>
                             <el-table-column label="操作" width="120">
                                 <template #default="scope">
-                                    <p class="indicitem" v-if="receiptMsg.stage !== '流程已结束'" @click="deleteRowFn(scope.row, scope.$index)">删除</p>
+                                    <p class="indicitem" v-if="isShowFn(receiptMsg.stage)" @click="deleteRowFn(scope.row, scope.$index)">删除</p>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -132,15 +132,15 @@
                     </el-tab-pane>
                     <el-tab-pane label="本月主要工作完成情况" name="second">
                         <div class="detaTableBtns">
-                            <div class="tableBtn add" @click="addSecondWork">
+                            <div class="tableBtn add" @click="addSecondWork" v-if="isShowFn(receiptMsg.stage)">
                                 <img :src="addIcon" alt="">
                                 <span>新增</span>
                             </div>
-                            <div class="tableBtn save" @click="saveSecondWork">
+                            <div class="tableBtn save" @click="saveSecondWork" v-if="isShowFn(receiptMsg.stage)">
                                 <img :src="saveIcon" alt="">
                                 <span>保存</span>
                             </div>
-                            <div class="tableBtn delete" @click="handleSecondWork">
+                            <div class="tableBtn delete" @click="handleSecondWork" v-if="isShowFn(receiptMsg.stage)">
                                 <img :src="deleteIcon" alt="">
                                 <span>删除</span>
                             </div>
@@ -290,12 +290,8 @@ export default {
         // 判断保存 导入按钮展示权限
         isShowFn(val) {
             let show = true
-            if (val === '流程已结束') {
+            if (val !== '流程未启动') {
                 show = false
-            } else {
-                if (this.userMes.deptId !== '23031009') {
-                    show = false
-                }
             }
             return show
         },
@@ -376,20 +372,24 @@ export default {
         getUserPostList() {
             let that = this
             that.showMessage = false
-            let params = {
-                userId: that.userMes.id,
-                current: 1,
-                size: 10
-            }
-            apiGetUserPostList(params).then(datas =>{
-                if (datas.data && datas.data.records.length>0) {
-                    datas.data.records.forEach(it =>{
-                        if (it.posName === '主任' || it.posName === '副主任') {
-                            that.showMessage = true
-                        }
-                    })
+            if (that.userMes.deptId === '23031009') {
+                that.showMessage = true
+            } else {
+                let params = {
+                    userId: that.userMes.id,
+                    current: 1,
+                    size: 10
                 }
-            })
+                apiGetUserPostList(params).then(datas =>{
+                    if (datas.data && datas.data.records.length>0) {
+                        datas.data.records.forEach(it =>{
+                            if (it.posName === '主任' || it.posName === '副主任') {
+                                that.showMessage = true
+                            }
+                        })
+                    }
+                })
+            }
         },
         employeeNoInputBlur(val, row) {
             row.employeeId = ''
@@ -444,7 +444,7 @@ export default {
                     assessmentDeclarationId: that.rowMsg.id,
                     employeeId: item.employeeId,
                     employeeName: item.employeeName,
-                    employeeNo: item.employeeNo ? item.employeeNo : emNo,
+                    employeeNo: item.employeeNo,
                     suggestedValue: Number(item.suggestedValue).toFixed(2),
                     serialNumber: item.serialNumber
                 }

+ 10 - 6
src/components/assessment/assessmentApplicationPage.vue

@@ -435,12 +435,16 @@ export default {
             
         },
         clickDes(row, column, cell, event) {
-            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
-            if ((userMes.id === row.applicantId && row.stage === '流程未启动') || userMes.deptId === '23031009') {
-                if (column.label === '申报理由') {
-                    row.chngeDes = true
-                } else {
-                    row.chngeDes = false
+            if (row.stage === '流程已结束') {
+                row.chngeDes = false
+            } else {
+                let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+                if ((userMes.id === row.applicantId && row.stage === '流程未启动') || userMes.deptId === '23031009') {
+                    if (column.label === '申报理由') {
+                        row.chngeDes = true
+                    } else {
+                        row.chngeDes = false
+                    }
                 }
             }
         },

+ 3 - 3
src/components/assessment/evaluationAmendmentNewFrom.vue

@@ -64,15 +64,15 @@
                                         <img :src="saveIcon" alt="">
                                         <span>保存</span>
                                     </div> -->
-                                    <div class="tableBtn add" @click="amendmentDetail">
+                                    <div class="tableBtn add" @click="amendmentDetail" v-if="receiptMsg.stage === '流程未启动'">
                                         <img :src="addIcon" alt="">
                                         <span>修订</span>
                                     </div>
-                                    <div class="tableBtn save" @click="saveDetail">
+                                    <div class="tableBtn save" @click="saveDetail" v-if="receiptMsg.stage === '流程未启动'">
                                         <img :src="saveIcon" alt="">
                                         <span>保存</span>
                                     </div>
-                                    <div class="tableBtn import" @click="handleImport">
+                                    <div class="tableBtn import" @click="handleImport" v-if="receiptMsg.stage === '流程未启动'">
                                         <img :src="importIcon" alt="">
                                         <span>导入</span>
                                     </div>

+ 10 - 6
src/components/assessment/evaluationAmendmentPage.vue

@@ -434,12 +434,16 @@ export default {
             })
         },
         clickDes(row, column, cell, event) {
-            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
-            if (userMes.id === row.createBy && row.stage === '流程未启动') {
-                if (column.label === '业务简述') {
-                    row.chngeDes = true
-                } else {
-                    row.chngeDes = false
+            if (row.stage === '流程已结束') {
+                row.chngeDes = false
+            } else {
+                let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+                if (userMes.id === row.createBy && row.stage === '流程未启动') {
+                    if (column.label === '业务简述') {
+                        row.chngeDes = true
+                    } else {
+                        row.chngeDes = false
+                    }
                 }
             }
         },

+ 17 - 6
src/components/assessment/evaluationApplicationTab.vue

@@ -18,7 +18,8 @@
                         </div>
                         <div class="exceed" style="margin-left: 10px">
                             <span class="exceedSpan" style="width: 100px">填报部门:</span>
-                            <el-select v-model="deptNameS" filterable clearable placeholder="请选择部门名称" @change="changeDeptLead">
+                            <el-select v-model="deptNameS" filterable clearable :disabled="userMes.deptId !== '23031009'"
+                             placeholder="请选择部门名称" @change="changeDeptLead">
                                 <el-option
                                     v-for="item in departData"
                                     :key="item.deptId"
@@ -28,6 +29,10 @@
                             </el-select>
                         </div>
                         <div class="exceed" style="margin-left: 10px">
+                            <span class="exceedSpan" style="width: 100px">人员编号:</span>
+                            <el-input v-model="userNameS" placeholder="请输入人员编号"/>
+                        </div>
+                        <!-- <div class="exceed" style="margin-left: 10px">
                             <span class="exceedSpan" style="width: 100px">选择人员:</span>
                             <el-select v-model="userNameS" filterable clearable placeholder="请选择人员">
                                 <el-option
@@ -37,7 +42,7 @@
                                 :value="item.id">
                                 </el-option>
                             </el-select>
-                        </div>
+                        </div> -->
                         <seachs @handleSeach="getreportTableData" :showRest="false"></seachs>
                         <el-button type="info" icon="Download" size="mini" @click="handleExport" style="margin-left:10px">导出</el-button>
                     </div>
@@ -47,6 +52,7 @@
                             <el-table-column label="人员编码" prop="employeeNo" align="center" />
                             <el-table-column label="人员姓名" prop="employeeName" align="center" />
                             <el-table-column label="评定系数" prop="suggestedValue" align="center" />
+                            <el-table-column label="申报月份" prop="declarationMonth" align="center" />
                             <el-table-column label="申报次数" prop="declarationsNumber" align="center" />
                             <el-table-column label="申报部门" prop="reportingDepartment" align="center" />
                             <el-table-column label="评定级别" prop="declarationLevel" align="center" />
@@ -74,20 +80,23 @@ export default {
             deptLeaderOptionDet: [],
             timeIds: [],
             deptNameS: '',
-            userNameS: ''
+            userNameS: '',
+            userMes: {},
         }
     },
     methods: {
         init(departData) {
             this.editEvaluaVisible = true
             this.departData = departData
+            this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            this.deptNameS = this.userMes.deptId ? this.userMes.deptId : ''
             this.reportTableData = []
             let month = (new Date().getMonth()+1) < 10 ? '0'+(new Date().getMonth()+1) : (new Date().getMonth()+1)
             let startTim = `${new Date().getFullYear()}-${new Date().getMonth() < 10 ? '0'+new Date().getMonth() : new Date().getMonth()}`
             let endTim = `${new Date().getFullYear()}-${month}`
             this.timeIds = [startTim, endTim]
             this.getreportTableData()
-            this.changeDeptLead()
+            // this.changeDeptLead()
         },
         sortMethods(a, b, it) {
             if (a[it] < b[it]) {
@@ -117,7 +126,8 @@ export default {
                 startTime: that.timeIds[0],
                 endTime: that.timeIds[1],
                 deptId: that.deptNameS,
-                employeeId: that.userNameS
+                // employeeId: that.userNameS
+                employeeNo: that.userNameS
             }
             apiGetstatisticalSummaryList(params).then(datas =>{
                 if (datas && datas.data) {
@@ -131,7 +141,8 @@ export default {
                 startTime: that.timeIds[0],
                 endTime: that.timeIds[1],
                 deptId: that.deptNameS,
-                employeeId: that.userNameS
+                // employeeId: that.userNameS
+                employeeNo: that.userNameS
             }
             let url = 'evaluation-dept-ad/generateStatisticalSummaryReports'
             let fileName = '统计汇总信息数据.xlsx'

+ 1 - 5
src/components/assessment/evaluationDeptBusinessFrom.vue

@@ -232,12 +232,8 @@ export default {
         // 判断保存 导入按钮展示权限
         isShowFn(val) {
             let show = true
-            if (val === '流程已结束') {
+            if (val !== '流程未启动') {
                 show = false
-            } else {
-                if (this.userMes.deptId !== '23031009') {
-                    show = false
-                }
             }
             return show
         },

+ 1 - 5
src/components/assessment/evaluationDeptStartFrom.vue

@@ -259,12 +259,8 @@ export default {
         // 判断保存 导入按钮展示权限
         isShowFn(val) {
             let show = true
-            if (val === '流程已结束') {
+            if (val !== '流程未启动') {
                 show = false
-            } else {
-                if (this.userMes.deptId !== '23031009') {
-                    show = false
-                }
             }
             return show
         },

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

@@ -417,12 +417,16 @@ export default {
             })
         },
         clickDes(row, column, cell, event) {
-            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
-            if (userMes.id === row.createBy && row.stage === '流程未启动') {
-                if (column.label === '业务简述') {
-                    row.chngeDes = true
-                } else {
-                    row.chngeDes = false
+            if (row.stage === '流程已结束') {
+                row.chngeDes = false
+            } else {
+                let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+                if (userMes.id === row.createBy && row.stage === '流程未启动') {
+                    if (column.label === '业务简述') {
+                        row.chngeDes = true
+                    } else {
+                        row.chngeDes = false
+                    }
                 }
             }
         },

+ 2 - 2
src/components/assessment/evaluationStartNewFrom.vue

@@ -64,11 +64,11 @@
                                         <img :src="saveIcon" alt="">
                                         <span>保存</span>
                                     </div> -->
-                                    <div class="tableBtn save" @click="saveDetail">
+                                    <div class="tableBtn save" @click="saveDetail" v-if="receiptMsg.stage === '流程未启动'">
                                         <img :src="saveIcon" alt="">
                                         <span>保存</span>
                                     </div>
-                                    <div class="tableBtn import" @click="handleImport">
+                                    <div class="tableBtn import" @click="handleImport" v-if="receiptMsg.stage === '流程未启动'">
                                         <img :src="importIcon" alt="">
                                         <span>导入</span>
                                     </div>

+ 10 - 6
src/components/assessment/evaluationStartPage.vue

@@ -425,12 +425,16 @@ export default {
             })
         },
         clickDes(row, column, cell, event) {
-            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
-            if (userMes.id === row.createBy && row.stage === '流程未启动') {
-                if (column.label === '业务简述') {
-                    row.chngeDes = true
-                } else {
-                    row.chngeDes = false
+            if (row.stage === '流程已结束') {
+                row.chngeDes = false
+            } else {
+                let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+                if (userMes.id === row.createBy && row.stage === '流程未启动') {
+                    if (column.label === '业务简述') {
+                        row.chngeDes = true
+                    } else {
+                        row.chngeDes = false
+                    }
                 }
             }
         },

+ 4 - 4
src/components/assessment/monthQuarterYearFrom.vue

@@ -61,20 +61,20 @@
                                         <!-- <el-icon :size="20" color="#3B7AD1" @click="getTableData(isClickTagId)"><Search /></el-icon> -->
                                     </div>
                                     <div class="tableBtn add" @click="addTableDetail"
-                                     v-if="(activeName === 'ZDZX' || activeName === 'GLSX') && indicatorList.length > 0">
+                                     v-if="(activeName === 'ZDZX' || activeName === 'GLSX') && indicatorList.length > 0 && receiptMsg.stage === '流程未启动'">
                                         <img :src="addIcon" alt="">
                                         <span>新增</span>
                                     </div>
                                     <div class="tableBtn save" @click="saveAddDetail"
-                                    v-if="(activeName === 'ZDZX' || activeName === 'GLSX') && indicatorList.length > 0">
+                                    v-if="(activeName === 'ZDZX' || activeName === 'GLSX') && indicatorList.length > 0 && receiptMsg.stage === '流程未启动'">
                                         <img :src="saveIcon" alt="">
                                         <span>保存</span>
                                     </div>
-                                    <div class="tableBtn save" @click="saveDetail" v-else>
+                                    <div class="tableBtn save" @click="saveDetail" v-if="activeName !== 'ZDZX' && activeName !== 'GLSX' && receiptMsg.stage === '流程未启动'">
                                         <img :src="saveIcon" alt="">
                                         <span>保存</span>
                                     </div>
-                                    <div class="tableBtn import" @click="handleImport">
+                                    <div class="tableBtn import" @click="handleImport" v-if="receiptMsg.stage === '流程未启动'">
                                         <img :src="importIcon" alt="">
                                         <span>导入</span>
                                     </div>

+ 164 - 35
src/components/taskCenter/taskApplicationFrom.vue

@@ -69,8 +69,32 @@
                 </el-row>
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="员工月度考核系数" name="first">
+                        <div class="detaTableBtns">
+                            <div class="tableBtn add" @click="addTableDetail">
+                                <img :src="addIcon" alt="">
+                                <span>新增</span>
+                            </div>
+                            <div class="tableBtn save" @click="saveDetail">
+                                <img :src="saveIcon" alt="">
+                                <span>保存</span>
+                            </div>
+                            <div class="tableBtn delete" @click="handleDelete">
+                                <img :src="deleteIcon" alt="">
+                                <span>删除</span>
+                            </div>
+                            
+                            <div class="tableBtn import" @click="handleImport">
+                                <img :src="importIcon" alt="">
+                                <span>导入</span>
+                            </div>
+                            <div class="tableBtn export" @click="handleExport">
+                                <img :src="exportIcon" alt="">
+                                <span>导出</span>
+                            </div>
+                        </div>
                         <el-table :data="quantifiedList.slice((pageLeft.currentPage-1)*pageLeft.pagesize, pageLeft.currentPage*pageLeft.pagesize)"
-                         style="width: 100%">
+                         style="width: 100%" @select="rowClick" @select-all="rowClick">
+                            <el-table-column type="selection" label="操作" align="center"></el-table-column>
                             <el-table-column label="序号" type="index" width="80" />
                             <el-table-column label="人员编号" prop="employeeNo">
                                 <template #default="scope">
@@ -102,7 +126,7 @@
                             </el-table-column>
                             <el-table-column label="操作" width="120">
                                 <template #default="scope">
-                                    <p class="indicitem" v-if="receiptMsg.stage !== '流程已结束'" @click="deleteRowFn(scope.row, scope.$index)">删除</p>
+                                    <p class="indicitem" @click="deleteRowFn(scope.row, scope.$index)">删除</p>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -115,28 +139,47 @@
                         </el-pagination>
                     </el-tab-pane>
                     <el-tab-pane label="本月主要工作完成情况" name="second">
+                        <div class="detaTableBtns">
+                            <div class="tableBtn add" @click="addSecondWork">
+                                <img :src="addIcon" alt="">
+                                <span>新增</span>
+                            </div>
+                            <div class="tableBtn save" @click="saveSecondWork">
+                                <img :src="saveIcon" alt="">
+                                <span>保存</span>
+                            </div>
+                            <div class="tableBtn delete" @click="handleSecondWork">
+                                <img :src="deleteIcon" alt="">
+                                <span>删除</span>
+                            </div>
+                        </div>
                         <el-table :data="secondWorkSituation.slice((pageRight.currentPage-1)*pageRight.pagesize, pageRight.currentPage*pageRight.pagesize)"
-                         style="width: 100%" @select="rowClick" @select-all="rowClick">
+                         style="width: 100%" @select="rowSituationClick" @select-all="rowSituationClick">
                             <el-table-column type="selection" label="操作" align="center"></el-table-column>
                             <el-table-column label="序号" type="index" width="80" />
                             <el-table-column label="工作内容">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.employeeNo" :rows="1" type="textarea" />
+                                    <el-input v-model="scope.row.jobContent" :rows="1" type="textarea" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="完成情况">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.employeeNo" />
+                                    <el-input v-model="scope.row.completionStatus" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="相关处室" width="200">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.employeeNo" />
+                                    <el-input v-model="scope.row.relatedOffice" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="经办人" width="200">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.employeeNo" />
+                                    <el-input v-model="scope.row.handlePeopleName" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="排序" >
+                                <template #default="scope">
+                                     <el-input-number v-model="scope.row.serialNumber" :min="1" />
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -168,7 +211,8 @@
 <script>
 import importDailog from '../importPage/importDailog.vue'
 import {apiPostevaluationdeptadDetails,apiGetevaluationdeptadUpdate, apiGetevaluationdeptadDelete,apiPostIsdoAction,apideptAdmodify,
-apiPostevaluationdeptadDetailsHead, apiGetuserPageList, apiGetUserPostList} from '../../api/api'
+apiPostevaluationdeptadDetailsHead, apiGetuserPageList, apiGetUserPostList, apiGetevaluationdeptadUpdateComplete,
+apiGetevaluationdeptadDeleteComplete} from '../../api/api'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
 import addIcon from '../../assets/btnIcon/add.png'
@@ -226,7 +270,8 @@ export default {
             userMes: {},
             instanceChild: {},
             keyId: '',
-            showMessage: false
+            showMessage: false,
+            changeSituationSelect: [],
         }
     },
     created() {
@@ -279,20 +324,30 @@ export default {
         getUserPostList() {
             let that = this
             that.showMessage = false
-            let params = {
-                userId: that.userMes.id,
-                current: 1,
-                size: 10
-            }
-            apiGetUserPostList(params).then(datas =>{
-                if (datas.data && datas.data.records.length>0) {
-                    datas.data.records.forEach(it =>{
-                        if (it.posName === '主任' || it.posName === '副主任') {
-                            that.showMessage = true
-                        }
-                    })
+            if (that.userMes.deptId === '23031009') {
+                that.showMessage = true
+            } else {
+                let params = {
+                    userId: that.userMes.id,
+                    current: 1,
+                    size: 10
                 }
-            })
+                apiGetUserPostList(params).then(datas =>{
+                    if (datas.data && datas.data.records.length>0) {
+                        datas.data.records.forEach(it =>{
+                            if (it.posName === '主任' || it.posName === '副主任') {
+                                that.showMessage = true
+                            }
+                        })
+                    }
+                })
+            }
+        },
+        rowClick(selection, row) {
+            this.changeDateSelect = selection
+        },
+        rowSituationClick(selection, row) {
+            this.changeSituationSelect = selection
         },
         changeratingGrade(val) {
             this.modeifyDetail('level', val)
@@ -325,7 +380,9 @@ export default {
                 }
             })
         },
-        handleClick() {
+        handleClick(val) {
+            this.changeDateSelect = []
+            this.changeSituationSelect = []
             this.activeName = val.props.name
         },
         handleCurrentChangeLeft(val) {
@@ -393,7 +450,7 @@ export default {
                 businessPlanId: this.keyId,
                 employeeId: '',
                 employeeNo: '',
-                suggestedValue: 1,
+                suggestedValue: 1.00,
                 serialNumber: 0
             }
             this.quantifiedList.unshift(obj)
@@ -402,20 +459,20 @@ export default {
             let that = this
             let params = []
             that.quantifiedList.forEach(item =>{
-                let emName = ''
-                let emNo = ''
-                that.deptLeaderOptionDet.forEach(it =>{
-                    if (item.employeeId === it.id) {
-                        emName = it.name
-                        emNo = it.no
-                    }
-                })
+                // let emName = ''
+                // let emNo = ''
+                // that.deptLeaderOptionDet.forEach(it =>{
+                //     if (item.employeeId === it.id) {
+                //         emName = it.name
+                //         emNo = it.no
+                //     }
+                // })
                 let obj = {
                     assessmentDeclarationId: that.keyId,
                     employeeId: item.employeeId,
-                    employeeName: emName,
-                    employeeNo: item.employeeNo ? item.employeeNo : emNo,
-                    suggestedValue: item.suggestedValue.toString(),
+                    employeeName: item.employeeName,
+                    employeeNo: item.employeeNo,
+                    suggestedValue: Number(item.suggestedValue).toFixed(2),
                     serialNumber: item.serialNumber
                 }
                 if (!item.showInput) {
@@ -547,6 +604,78 @@ export default {
                 }
             })
         },
+        addSecondWork() {
+            this.pageRight.currentPage = 1
+            let obj = {
+                showInput: true,
+                assessmentDeclarationId: this.keyId,
+                jobContent: '',
+                completionStatus: '',
+                relatedOffice: '',
+                handlePeopleName: this.userMes.name,
+                serialNumber: 0
+            }
+            this.secondWorkSituation.unshift(obj)
+        },
+        saveSecondWork() {
+            let that = this
+            let params = []
+            that.secondWorkSituation.forEach(item =>{
+                let obj = {
+                    assessmentDeclarationId: that.keyId,
+                    jobContent: item.jobContent,
+                    completionStatus: item.completionStatus,
+                    relatedOffice: item.relatedOffice,
+                    handlePeopleName: item.handlePeopleName,
+                    serialNumber: item.serialNumber
+                }
+                if (!item.showInput) {
+                    obj.id = item.id
+                }
+                params.push(obj)
+            })
+            apiGetevaluationdeptadUpdateComplete(params).then(datas =>{
+                if (datas) {
+                    if (datas.success) {
+                        that.$message({
+                            message: '保存成功',
+                            type: 'success'
+                        });
+                        that.activeName = 'second'
+                        that.getDetails(that.keyId)
+                    } else {
+                        that.$message({
+                            message: datas.message,
+                            type: 'error'
+                        })
+                    }
+                }
+            })
+        },
+        handleSecondWork() {
+            this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                let that = this
+                let paramsArr = []
+                that.changeSituationSelect.forEach(it =>{
+                    paramsArr.push(it.id)
+                })
+                apiGetevaluationdeptadDeleteComplete(paramsArr.join(',')).then(datas =>{
+                    if (datas) {
+                        that.$message({
+                            type: 'success',
+                            message: '删除成功!'
+                        });
+                        that.activeName = 'second'
+                        that.changeSituationSelect = []
+                        that.getDetails(that.keyId)
+                    }
+                })
+            })
+        },
     }
 }
 </script>

+ 4 - 4
src/components/taskCenter/taskCenterDeptBusinessFrom.vue

@@ -71,7 +71,7 @@
                             <el-table-column label="序号" type="index" width="80" />
                             <el-table-column label="部门名称" prop="deptName" width="260">
                                 <template #default="scope">
-                                    <el-select v-model="scope.row.deptName" :disabled="receiptMsg.stage === '流程已结束'"
+                                    <el-select v-model="scope.row.deptName"
                                      placeholder="请选择所属部门" v-if="scope.row.showInput">
                                         <el-option
                                         v-for="item in departData"
@@ -90,21 +90,21 @@
                             <el-table-column label="基础分" width="150" prop="baseScore" />
                             <el-table-column label="完成情况" width="300">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.completionStatus" :disabled="receiptMsg.stage === '流程已结束'"
+                                    <el-input v-model="scope.row.completionStatus"
                                      type="textarea" :rows="2" placeholder="请输入完成情况"></el-input>
                                 </template>
                             </el-table-column>
                             <el-table-column label="评价标准" prop="evaluationCriteria" width="200" />
                             <el-table-column label="自评得分" width="150">
                                 <template #default="scope">
-                                    <el-input-number v-model="scope.row.evaluationScore" :disabled="receiptMsg.stage === '流程已结束'"
+                                    <el-input-number v-model="scope.row.evaluationScore"
                                      :precision="2" :step="0.1" :min="0" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="审核状态" width="200" >
                                 <template #default="scope">
                                     <el-select v-model="scope.row.auditStatus"
-                                     :disabled="userMes.deptId !== '23031009' || receiptMsg.stage === '流程已结束'" placeholder="请选择审核状态">
+                                     :disabled="userMes.deptId !== '23031009'" placeholder="请选择审核状态">
                                         <el-option
                                         v-for="item in statusData"
                                         :key="item.id"

+ 8 - 19
src/components/taskCenter/taskCenterDeptStartFrom.vue

@@ -76,7 +76,7 @@
                             <el-table-column label="部门名称" prop="deptName" width="300">
                                 <template #default="scope">
                                     <el-select v-model="scope.row.deptName"
-                                    :disabled="(scope.row.dataPermission === '-1' && scope.row.deptName !== '') || receiptMsg.stage === '流程已结束'"
+                                    :disabled="scope.row.dataPermission === '-1' && scope.row.deptName !== ''"
                                      placeholder="请选择所属部门" filterable v-if="scope.row.showInput">
                                         <el-option
                                         v-for="item in departData"
@@ -92,39 +92,39 @@
                             <el-table-column label="指标名称" width="200" >
                                 <template #default="scope">
                                     <el-input v-model="scope.row.targetName"
-                                    :disabled="scope.row.dataPermission === '-1' || receiptMsg.stage === '流程已结束'"
+                                    :disabled="scope.row.dataPermission === '-1'"
                                      placeholder="请输入指标名称"></el-input>
                                 </template>
                             </el-table-column>
                             <el-table-column label="目标值" width="500">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.targetValue"
-                                    :disabled="scope.row.dataPermission === '-1' || receiptMsg.stage === '流程已结束'"
+                                    :disabled="scope.row.dataPermission === '-1'"
                                      type="textarea" :rows="2" placeholder="请输入目标值"></el-input>
                                 </template>
                             </el-table-column>
                             <el-table-column label="基础分" width="150">
                                 <template #default="scope">
-                                    <el-input-number v-model="scope.row.baseScore" :disabled="receiptMsg.stage === '流程已结束'"
+                                    <el-input-number v-model="scope.row.baseScore"
                                      :precision="2" :step="0.1" :min="0" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="评价标准" >
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.evaluationCriteria" :disabled="receiptMsg.stage === '流程已结束'"
+                                    <el-input v-model="scope.row.evaluationCriteria"
                                     type="textarea" :rows="2" placeholder="请输入评价标准"></el-input>
                                 </template>
                             </el-table-column>
                             <el-table-column label="排序" width="130" >
                                 <template #default="scope">
                                     <el-input-number v-model="scope.row.serialNumber"
-                                      :disabled="(scope.row.dataPermission === '-1' && scope.row.serialNumber !== '') || receiptMsg.stage === '流程已结束'" :min="1" />
+                                      :disabled="(scope.row.dataPermission === '-1' && scope.row.serialNumber !== '')" :min="1" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="审核状态" width="150" >
                                 <template #default="scope">
                                     <el-select v-model="scope.row.auditStatus"
-                                    :disabled="(scope.row.dataPermission === '-1' && scope.row.auditStatus !== '') || userMes.deptId !== '23031009' || receiptMsg.stage === '流程已结束'"
+                                    :disabled="(scope.row.dataPermission === '-1' && scope.row.auditStatus !== '') || userMes.deptId !== '23031009'"
                                      placeholder="请选择审核状态">
                                         <el-option
                                         v-for="item in statusData"
@@ -138,7 +138,7 @@
                             </el-table-column>
                             <el-table-column label="操作" width="80" align="center">
                                 <template #default="scope">
-                                    <p class="indicitem" v-if="showDelete(scope.row)" @click="handleDelete(scope.row)">删除</p>
+                                    <p class="indicitem" v-if="scope.row.dataPermission === '-1'" @click="handleDelete(scope.row)">删除</p>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -286,17 +286,6 @@ export default {
                 }
             })
         },
-        showDelete(row) {
-            let show = true
-            if (this.receiptMsg.stage === '流程已结束') {
-                show = false
-            } else {
-                if (row.dataPermission !== '-1') {
-                    show = false
-                }
-            }
-            return show
-        },
         // 整合部门数据
         // getshowDepartDataFn(row, deptData) {
         //     let deptIdArr = row.deptId.split(',')