Browse Source

部门指标计划页面,绩效结果考核申报详情页面,问题,样式修改(包括任务中心);

SunZehao 1 year ago
parent
commit
df188ff622

+ 27 - 20
src/components/assessment/assessmentApplicationFrom.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="deptstartFrom">
+    <div class="applicationFrom">
         <el-dialog title="绩效结果考核申报详情" v-model="dialogVisible" :fullscreen="true" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">单据信息:</p>
@@ -16,8 +16,8 @@
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsg_data">
-                            <span class="data_tit">评定等级:</span>
-                            <span>{{receiptMsg.ratingGrade}}</span>
+                            <span class="data_tit">申报级别:</span>
+                            <span>{{receiptMsg.declarationLevel}}级</span>
                         </div>
                         <div class="danjuMsg_data">
                             <span class="data_tit">申报领导:</span>
@@ -46,8 +46,8 @@
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsg_data">
-                            <span class="data_tit">申报级别:</span>
-                            <span>{{receiptMsg.declarationLevel}}级</span>
+                            <span class="data_tit">评定等级:</span>
+                            <span>{{receiptMsg.ratingGrade}}</span>
                         </div>
                     </el-col>
                     <el-col :span="18">
@@ -120,7 +120,7 @@
                             </el-table-column>
                             <el-table-column label="操作" width="120">
                                 <template #default="scope">
-                                    <p class="indicitem" v-if="receiptMsg.stage !== '流程已结束'" @click="deleteRowFn(scope.row)">删除</p>
+                                    <p class="indicitem" v-if="receiptMsg.stage !== '流程已结束'" @click="deleteRowFn(scope.row, scope.$index)">删除</p>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -370,22 +370,26 @@ export default {
                 }
             })
         },
-        deleteRowFn(row) {
+        deleteRowFn(row, index) {
             let that = this
             this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                apiGetevaluationdeptadDelete(row.id).then(datas =>{
-                    if (datas) {
-                        that.$message({
-                            type: 'success',
-                            message: '删除成功!'
-                        });
-                        that.getDetails(that.rowMsg.id)
-                    }
-                })
+                if (!row.id) {
+                    that.quantifiedList.splice(index, 1)
+                } else {
+                    apiGetevaluationdeptadDelete(row.id).then(datas =>{
+                        if (datas) {
+                            that.$message({
+                                type: 'success',
+                                message: '删除成功!'
+                            });
+                            that.getDetails(that.rowMsg.id)
+                        }
+                    })
+                }
             })
         },
         handleImport() {
@@ -434,7 +438,7 @@ export default {
 </script>
 
 <style lang="less">
-.deptstartFrom{
+.applicationFrom{
     .el-overlay{
         .el-dialog{
             // margin-top: 7vh;
@@ -489,8 +493,8 @@ export default {
                         display: flex;
                         z-index: 11111;
                         justify-content: end;
-                        // position: relative;
-                        // top: 32px;
+                        position: relative;
+                        top: 32px;
                         // left: 48vw;
                         width: 100%;
                         .detaTableBtns{
@@ -501,12 +505,15 @@ export default {
                                 display: flex;
                                 height: 20px;
                                 margin: 0 10px;
-                                width: 20%;
+                                // width: 20%;
+                                width: fit-content;
                                 img{
                                     margin-right: 5px;
                                     margin-top: 1px;
                                 }
                                 span{
+                                    width: 35px;
+                                    display: inline-block;
                                     font-size: 14px;
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;

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

@@ -409,8 +409,8 @@ export default {
                         display: flex;
                         z-index: 11111;
                         justify-content: end;
-                        // position: relative;
-                        // top: 32px;
+                        position: relative;
+                        top: 32px;
                         // left: 50vw;
                         width: 100%;
                         .detaTableBtns{

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

@@ -111,7 +111,7 @@
                                     type="textarea" :rows="2" placeholder="请输入评价标准"></el-input>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="排序" width="100" >
+                            <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" />
@@ -134,7 +134,7 @@
                             </el-table-column>
                             <el-table-column label="操作" width="80" align="center">
                                 <template #default="scope">
-                                    <p class="indicitem" v-if="scope.row.dataPermission !== '-1' || receiptMsg.stage === '流程已结束'" @click="handleDelete(scope.row)">删除</p>
+                                    <p class="indicitem" v-if="showDelete(scope.row)" @click="handleDelete(scope.row)">删除</p>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -296,6 +296,17 @@ export default {
         handleCurrentChangeRight(val) {
             this.pageRight.currentPage = val
         },
+        showDelete(row) {
+            let show = true
+            if (this.receiptMsg.stage === '流程已结束') {
+                show = false
+            } else {
+                if (row.dataPermission !== '-1') {
+                    show = false
+                }
+            }
+            return show
+        },
         handleDelete(row) {
             this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
                 confirmButtonText: '确定',
@@ -502,26 +513,29 @@ export default {
                         display: flex;
                         z-index: 11111;
                         justify-content: end;
-                        // position: relative;
-                        // top: 32px;
+                        position: relative;
+                        top: 32px;
                         // left: 50vw;
                         width: 100%;
                         .detaTableBtns{
                             display: flex;
+                            justify-content: end;
                             width: 300px;
                             margin-top: 5px;
                             .tableBtn {
                                 display: flex;
                                 height: 20px;
                                 margin: 0 10px;
-                                width: 20%;
+                                // width: 20%;
+                                width: fit-content;
                                 img{
                                     margin-right: 5px;
                                     margin-top: 1px;
                                 }
                                 span{
                                     display: inline-block;
-                                    width: 100%;
+                                    // width: 100%;
+                                    width: 35px;
                                     font-size: 14px;
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;

+ 36 - 29
src/components/taskCenter/taskApplicationFrom.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="deptstartFrom">
+    <div class="applicationFrom">
         <el-dialog title="绩效结果考核申报详情" v-model="dialogVisible" :fullscreen="true" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">单据信息:</p>
@@ -15,17 +15,9 @@
                         </div>
                     </el-col>
                     <el-col :span="6">
-                        <div class="danjuMsgSelect">
-                            <span class="data_tit">评定等级:</span>
-                            <span v-if="userMes.deptId !== '23031009'">{{receiptMsg.ratingGrade}}</span>
-                            <el-select v-model="receiptMsg.ratingGrade" placeholder="请选择评定等级" @change="changeratingGrade" v-else>
-                                <el-option
-                                v-for="item in ratingGradeOption"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">申报级别:</span>
+                            <span>{{receiptMsg.declarationLevel}}级</span>
                         </div>
                         <div class="danjuMsg_data">
                             <span class="data_tit">申报领导:</span>
@@ -53,9 +45,17 @@
                         </div>
                     </el-col>
                     <el-col :span="6">
-                        <div class="danjuMsg_data">
-                            <span class="data_tit">申报级别:</span>
-                            <span>{{receiptMsg.declarationLevel}}级</span>
+                        <div class="danjuMsgSelect">
+                            <span class="data_tit">评定等级:</span>
+                            <span v-if="userMes.deptId !== '23031009'">{{receiptMsg.ratingGrade}}</span>
+                            <el-select v-model="receiptMsg.ratingGrade" placeholder="请选择评定等级" @change="changeratingGrade" v-else>
+                                <el-option
+                                v-for="item in ratingGradeOption"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                                </el-option>
+                            </el-select>
                         </div>
                     </el-col>
                     <el-col :span="18">
@@ -121,7 +121,7 @@
                             </el-table-column>
                             <el-table-column label="操作" width="120">
                                 <template #default="scope">
-                                    <p class="indicitem" v-if="receiptMsg.stage !== '流程已结束'" @click="deleteRowFn(scope.row)">删除</p>
+                                    <p class="indicitem" v-if="receiptMsg.stage !== '流程已结束'" @click="deleteRowFn(scope.row, scope.$index)">删除</p>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -398,15 +398,19 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                apiGetevaluationdeptadDelete(row.id).then(datas =>{
-                    if (datas) {
-                        that.$message({
-                            type: 'success',
-                            message: '删除成功!'
-                        });
-                        that.getDetails(that.rowMsg.id)
-                    }
-                })
+                if (!row.id) {
+                    that.quantifiedList.splice(index, 1)
+                } else {
+                    apiGetevaluationdeptadDelete(row.id).then(datas =>{
+                        if (datas) {
+                            that.$message({
+                                type: 'success',
+                                message: '删除成功!'
+                            });
+                            that.getDetails(that.rowMsg.id)
+                        }
+                    })
+                }
             })
         },
         handleImport() {
@@ -499,7 +503,7 @@ export default {
 </script>
 
 <style lang="less">
-.deptstartFrom{
+.applicationFrom{
     .el-overlay{
         .el-dialog{
             // margin-top: 7vh;
@@ -574,8 +578,8 @@ export default {
                         display: flex;
                         z-index: 11111;
                         justify-content: end;
-                        // position: relative;
-                        // top: 32px;
+                        position: relative;
+                        top: 32px;
                         // left: 50vw;
                         width: 100%;
                         .detaTableBtns{
@@ -586,12 +590,15 @@ export default {
                                 display: flex;
                                 height: 20px;
                                 margin: 0 10px;
-                                width: 13%;
+                                // width: 13%;
+                                width: fit-content;
                                 img{
                                     margin-right: 5px;
                                     margin-top: 1px;
                                 }
                                 span{
+                                    display: inline-block;
+                                    width: 35px;
                                     font-size: 14px;
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;

+ 18 - 4
src/components/taskCenter/taskCenterDeptStartFrom.vue

@@ -112,7 +112,7 @@
                                     type="textarea" :rows="2" placeholder="请输入评价标准"></el-input>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="排序" width="100" >
+                            <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" />
@@ -135,7 +135,7 @@
                             </el-table-column>
                             <el-table-column label="操作" width="80" align="center">
                                 <template #default="scope">
-                                    <p class="indicitem" v-if="scope.row.dataPermission !== '-1' || receiptMsg.stage === '流程已结束'" @click="handleDelete(scope.row)">删除</p>
+                                    <p class="indicitem" v-if="showDelete(scope.row)" @click="handleDelete(scope.row)">删除</p>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -281,6 +281,17 @@ 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(',')
@@ -584,20 +595,23 @@ export default {
                         width: 50%;
                         .detaTableBtns{
                             display: flex;
+                            justify-content: end;
                             width: 300px;
                             margin-top: 5px;
                             .tableBtn {
                                 display: flex;
                                 height: 20px;
                                 margin: 0 10px;
-                                width: 20%;
+                                // width: 20%;
+                                width: fit-content;
                                 img{
                                     margin-right: 5px;
                                     margin-top: 1px;
                                 }
                                 span{
                                     display: inline-block;
-                                    width: 100%;
+                                    // width: 100%;
+                                    width: 35px;
                                     font-size: 14px;
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;