Jelajahi Sumber

考评启动服务联调;考评启动明细详情服务联调;考评启动明细详情表格的修改服务联调;ui样式修改;页面分页联调;

SunZehao 2 tahun lalu
induk
melakukan
aa10c5336d

+ 4 - 0
src/api/api.js

@@ -74,6 +74,10 @@ export function apiGetdeptresponDetail(params) {
         params: params
     })
 }
+//------考评启动-详情-修改
+export function apiGetindicatorsaveBatchDto(params) {
+    return httpRequest.post('responsibility-indicator-info/saveBatchDto', params)
+}
 //----单位/部门考评配置所有数据
 export function apiGetOrganizationListAll(params) {
     return httpRequest({

TEMPAT SAMPAH
src/assets/btnIcon/add.png


TEMPAT SAMPAH
src/assets/btnIcon/addW.png


TEMPAT SAMPAH
src/assets/btnIcon/delete.png


TEMPAT SAMPAH
src/assets/btnIcon/deleteW.png


TEMPAT SAMPAH
src/assets/btnIcon/edit.png


TEMPAT SAMPAH
src/assets/btnIcon/editW.png


TEMPAT SAMPAH
src/assets/btnIcon/save.png


+ 2 - 2
src/assets/css/main.css

@@ -198,13 +198,13 @@ a {
     background-color: #50C14E !important;
 }
 .el-button--danger{
-    background-color: #F5A623 !important;
+    background-color: #F65177 !important;
 }
 .el-button--info{
     background-color: #9DA5BE !important;
 }
 .el-button--warning{
-    background-color: #F65177 !important;
+    background-color: #F5A623 !important;
 }
 
 .el-table th {

TEMPAT SAMPAH
src/assets/menuImg/home.png


TEMPAT SAMPAH
src/assets/menuImg/quanxian.png


TEMPAT SAMPAH
src/assets/menuImg/tixi.png


TEMPAT SAMPAH
src/assets/menuImg/yewu.png


TEMPAT SAMPAH
src/assets/menuImg/zhishiku.png


+ 266 - 294
src/components/assessment/evaluationStartFrom.vue

@@ -1,167 +1,106 @@
 <template>
     <div class="startFrom">
-        <el-dialog title="考评启动详情" v-model="dialogVisible" width="1400px" :close-on-click-modal="false">
-            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="demo-ruleForm" :validate-on-rule-change="false">
+        <el-dialog title="考评启动详情" v-model="dialogVisible" width="80vw" :close-on-click-modal="false">
+            <div class="startDetail">
                 <p class="starttitleSty">单据信息:</p>
                 <el-row class="danjuMsg">
                     <el-col :span="6">
                         <div class="danjuMsg_data">
                             <span class="data_tit">业务编号:</span>
-                            <span>VB131315</span>
+                            <span>{{receiptMsg.code}}</span>
                         </div>
                         <div class="danjuMsg_data">
-                            <span class="data_tit">流程状态:</span>
-                            <span>进行中</span>
+                            <span class="data_tit">创建日期:</span>
+                            <span>{{receiptMsg.createDate}}</span>
                         </div>
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsg_data">
-                            <span class="data_tit">填报日期:</span>
-                            <span>2023-02-23</span>
+                            <span class="data_tit">业务简述:</span>
+                            <span>{{receiptMsg.des}}</span>
                         </div>
                         <div class="danjuMsg_data">
-                            <span class="data_tit">制单人员:</span>
-                            <span>XXX</span>
+                            <span class="data_tit">业务类型:</span>
+                            <span>{{receiptMsg.type}}</span>
                         </div>
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsg_data">
-                            <span class="data_tit">业务简述:</span>
-                            <span>国电电力2023年关键业绩指标</span>
+                            <span class="data_tit">流程状态:</span>
+                            <span>{{receiptMsg.stage}}</span>
                         </div>
                         <div class="danjuMsg_data">
-                            <span class="data_tit">填报单位:</span>
-                            <span>XXX</span>
-                        </div>
-                    </el-col>
-                </el-row>
-                <p class="starttitleSty">基本信息:</p>
-                <el-row class="danjuMsg">
-                    <el-col :span="6">
-                        <div class="danjuMsg_data" style="display:flex;">
-                            <span class="data_tit">单位名称:</span>
-                            <el-form-item prop="">
-                                <el-input v-model="input" placeholder="Please input" />
-                            </el-form-item>
-                        </div>
-                        <div class="danjuMsg_data" style="display:flex;">
-                            <span class="data_tit" style="display:inline-block;width:60px">年度:</span>
-                            <el-form-item prop="">
-                                <el-input v-model="input" placeholder="Please input" />
-                            </el-form-item>
-                        </div>
-                    </el-col>
-                    <el-col :span="6">
-                        <div class="danjuMsg_data" style="display:flex;">
-                            <span class="data_tit data_tit_wd">业务类别:</span>
-                            <el-form-item prop="">
-                                <el-input v-model="input" placeholder="Please input" />
-                            </el-form-item>
-                        </div>
-                        <div class="danjuMsg_data" style="display:flex;">
-                            <span class="data_tit data_tit_wd">年度考评得分:</span>
-                            <el-form-item prop="">
-                                <el-input-number
-                                    v-model="num"
-                                    :min="1"
-                                    :max="10"
-                                    size="small"
-                                    controls-position="right"
-                                    @change="handleChange"
-                                />
-                            </el-form-item>
+                            <span class="data_tit">年度:</span>
+                            <span>{{receiptMsg.year}}</span>
                         </div>
                     </el-col>
                     <el-col :span="6">
-                        <div class="danjuMsg_data" style="display:flex;">
-                            <span class="data_tit data_tit_wd">考评总分:</span>
-                            <el-form-item prop="">
-                                <el-input-number
-                                    v-model="num"
-                                    :min="1"
-                                    :max="10"
-                                    size="small"
-                                    controls-position="right"
-                                    @change="handleChange"
-                                />
-                            </el-form-item>
-                        </div>
-                        <div class="danjuMsg_data" style="display:flex;">
-                            <span class="data_tit data_tit_wd">年度考评级别:</span>
-                            <el-form-item prop="">
-                                <el-input v-model="input" placeholder="Please input" />
-                            </el-form-item>
-                        </div>
-                    </el-col>
-                    <el-col :span="6">
-                        <div class="danjuMsg_data" style="display:flex;">
-                            <span class="data_tit data_tit_wd">任务进度:</span>
-                            <el-form-item prop="">
-                                <el-input v-model="input" placeholder="Please input" />
-                            </el-form-item>
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">创建人:</span>
+                            <span>{{receiptMsg.creator}}</span>
                         </div>
-                        <div class="danjuMsg_data" style="display:flex;">
-                            <span class="data_tit data_tit_wd">年度考评排名:</span>
-                            <el-form-item prop="">
-                                <el-input v-model="input" placeholder="Please input" />
-                            </el-form-item>
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">单据状态:</span>
+                            <span>{{receiptMsg.recStage}}</span>
                         </div>
                     </el-col>
                 </el-row>
-                <p class="starttitleSty">考评目标:</p>
-                <el-table :data="tableData" border style="width: 100%">
-                    <el-table-column type="index" label="序号" width="80" />
-                    <el-table-column label="指标项" prop="targetindex" width="300" />
-                    <el-table-column label="业务分类" prop="type" width="100" />
-                    <el-table-column label="填报部门">
-                        <template #default="scope">
-                            <!-- <span>{{scope.row.dept}}</span> -->
-                            <el-input v-model="scope.row.dept" placeholder="Please input" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="填报人">
-                        <template #default="scope">
-                            <!-- <span>{{scope.row.eidtor}}</span> -->
-                            <el-input v-model="scope.row.eidtor" placeholder="Please input" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="填报日期">
-                        <template #default="scope">
-                            <!-- <span>{{scope.row.eidDate}}</span> -->
-                            <el-date-picker
-                                v-model="scope.row.eidDate"
-                                type="date"
-                                placeholder="Pick a day"
-                                :size="size"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="审批人">
-                        <template #default="scope">
-                            <!-- <span>{{scope.row.approvalor}}</span> -->
-                            <el-input v-model="scope.row.approvalor" placeholder="Please input" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="计划分值">
-                        <template #default="scope">
-                            <!-- <span>{{scope.row.plan}}</span> -->
-                            <el-input v-model="scope.row.plan" placeholder="Please input" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="进度分值">
-                        <template #default="scope">
-                            <!-- <span>{{scope.row.progress}}</span> -->
-                            <el-input v-model="scope.row.progress" placeholder="Please input" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="综合得分">
-                        <template #default="scope">
-                            <!-- <span>{{scope.row.synthesize}}</span> -->
-                            <el-input v-model="scope.row.synthesize" placeholder="Please input" />
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-form>
+                <div class="detaTableBtns">
+                    <div class="tableBtn add">
+                        <img :src="addIcon" alt="">
+                        <span>新增</span>
+                    </div>
+                    <div class="tableBtn save" @click="saveDetail">
+                        <img :src="saveIcon" alt="">
+                        <span>保存</span>
+                    </div>
+                    <!-- <div class="tableBtn edit">
+                        <img :src="editIcon" alt="">
+                        <span>新增</span>
+                    </div> -->
+                    <div class="tableBtn delete">
+                        <img :src="deleteIcon" alt="">
+                        <span>删除</span>
+                    </div>
+                </div>
+                <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+                    <el-tab-pane label="考评指标项内容" name="first">
+                        <el-table :data="quantifiedList" style="width: 100%" @select="rowClick" @select-all="rowClick">
+                            <el-table-column type="selection" label="操作" align="center"></el-table-column>
+                            <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="optionName" /> -->
+                            <el-table-column label="计划值">
+                                <template #default="scope">
+                                    <el-input-number v-model="scope.row.quantifiedValue" :precision="2" :step="0.1" :min="1" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="单位" prop="unit" />
+                        </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="optionName" /> -->
+                            <el-table-column label="计划值">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.nonQuantifiedValue" />
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </el-tab-pane>
+                </el-tabs>
+                
+            </div>
             <template #footer>
                 <span class="dialog-footer">
                     <el-button type="primary" @click="dialogVisible = false">取 消</el-button>
@@ -172,133 +111,60 @@
 </template>
 
 <script>
-import {apiGetdeptresponDetail,} from '../../api/api'
+import {apiGetdeptresponDetail,apiGetindicatorsaveBatchDto} from '../../api/api'
+import addIcon from '../../assets/btnIcon/add.png'
+import saveIcon from '../../assets/btnIcon/save.png'
+import editIcon from '../../assets/btnIcon/edit.png'
+import deleteIcon from '../../assets/btnIcon/delete.png'
 export default {
     data() {
         return {
             dialogVisible: false,
-            tableData: [],
-            ruleForm: {
-
-            },
-            rules: {
-                // indicatorId: [
-                //     { required: true, message: '请选择指标名称', trigger: 'blur' }
-                // ],
-                // totalScore: [
-                //     { required: true, message: '请输入指标总分', trigger: 'blur' }
-                // ],
-                // evaluateMethod: [
-                //     { required: true, message: '请选择评分方式', trigger: 'change' }
-                // ],
-                // evaluateFormula: [
-                //     { required: true, message: '请输入评分公式', trigger: 'blur' }
-                // ],
-                // mappingFun: [
-                //     { required: true, message: '请选择隐射函数', trigger: 'change' }
-                // ],
-                // desc: [
-                //     { required: true, message: '请输入描述', trigger: 'change' }
-                // ]
+            activeName: 'first',
+            quantifiedList: [],
+            nonQuantifiedList: [],
+            changeDateSelect: [],
+            receiptMsg: {
+                code: '',
+                des: '',
+                stage: '',
+                creator: '',
+                createDate: '',
+                type: '',
+                year: '',
+                recStage: ''
             },
+            addIcon: addIcon,
+            saveIcon: saveIcon,
+            editIcon: editIcon,
+            deleteIcon: deleteIcon,
+            rowMsg: {}
         }
     },
     created() {
-        this.tableData = [
-            {
-                targetindex: '填报部门',
-                type: '基建',
-                dept: '',
-                eidtor: '',
-                eidDate: '',
-                approvalor: '',
-                plan: '',
-                progress: '',
-                synthesize: ''
-            },
-            {
-                targetindex: '深化改革(创一流)',
-                type: '重点专项',
-                dept: '',
-                eidtor: '',
-                eidDate: '',
-                approvalor: '',
-                plan: '',
-                progress: '',
-                synthesize: ''
-            },
-            {
-                targetindex: '亏损企业治理',
-                type: '重点专项',
-                dept: '',
-                eidtor: '',
-                eidDate: '',
-                approvalor: '',
-                plan: '',
-                progress: '',
-                synthesize: ''
-            },
-            {
-                targetindex: '双碳目标落实',
-                type: '重点专项',
-                dept: '',
-                eidtor: '',
-                eidDate: '',
-                approvalor: '',
-                plan: '',
-                progress: '',
-                synthesize: ''
-            },
-            {
-                targetindex: '煤矿证照办理',
-                type: '重点专项',
-                dept: '',
-                eidtor: '',
-                eidDate: '',
-                approvalor: '',
-                plan: '',
-                progress: '',
-                synthesize: ''
-            },
-            {
-                targetindex: '低效无效资产处置',
-                type: '生产经营',
-                dept: '',
-                eidtor: '',
-                eidDate: '',
-                approvalor: '',
-                plan: '',
-                progress: '',
-                synthesize: ''
-            },
-            {
-                targetindex: '智慧电站建设、煤电三改联动、综合能源发展',
-                type: '职业健康',
-                dept: '',
-                eidtor: '',
-                eidDate: '',
-                approvalor: '',
-                plan: '',
-                progress: '',
-                synthesize: ''
-            },
-            {
-                targetindex: '智慧电站建设、煤电三改联动、综合能源发展',
-                type: '职业健康',
-                dept: '',
-                eidtor: '',
-                eidDate: '',
-                approvalor: '',
-                plan: '',
-                progress: '',
-                synthesize: ''
-            },
-        ]
     },
     methods: {
         init(row) {
             this.dialogVisible = true
+            this.activeName = 'first'
+            this.receiptMsg = {
+                code: row.responsibilityCode,
+                des: row.des,
+                stage: row.stage,
+                creator: row.createBy,
+                createDate: row.createTime,
+                type: row.organizationType,
+                year: row.year,
+                recStage: '有效'
+            }
             this.getDetails(row.id)
+            this.rowMsg = row
+        },
+        handleClick() {
+            this.changeDateSelect = []
+        },
+        rowClick(selection, row) {
+            this.changeDateSelect = selection
         },
         //获取详情
         getDetails(id) {
@@ -307,11 +173,44 @@ export default {
                 deptResponsibilityIds: id
             }
             apiGetdeptresponDetail(params).then(datas =>{
-                if (datas) {
-                    console.log(datas)
+                if (datas && datas.data) {
+                    that.quantifiedList = datas.data.quantifiedList
+                    that.nonQuantifiedList = datas.data.nonQuantifiedList
                 }
             })
         },
+        saveDetail() {
+            let that = this
+            let params = []
+            if (that.activeName === 'first') {
+                that.quantifiedList.forEach(item =>{
+                    let obj = {
+                        id: item.id,
+                        isQuantified: '是',
+                        quantifiedValue: item.quantifiedValue
+                    }
+                    params.push(obj)
+                })
+            } else {
+                that.nonQuantifiedList.forEach(item =>{
+                    let obj = {
+                        id: item.id,
+                        isQuantified: '否',
+                        nonQuantifiedValue: item.nonQuantifiedValue
+                    }
+                    params.push(obj)
+                })
+            }
+            apiGetindicatorsaveBatchDto(params).then(datas =>{
+                if (datas && datas.success) {
+                    that.$message({
+                        message: '保存成功',
+                        type: 'success'
+                    });
+                    that.getDetails(that.rowMsg.id)
+                }
+            })
+        }
     }
 }
 </script>
@@ -320,62 +219,135 @@ export default {
 .startFrom{
     .el-overlay{
         .el-dialog{
-            margin-top: 10vh;
+            margin-top: 7vh;
             .el-dialog__body{
-                padding: 0px 60px 20px 20px !important;
-                .starttitleSty{
-                    border-left: 4px solid #007aab;
-                    padding-left: 5px;
-                    font-size: 14px;
-                    font-weight: bold;
-                    font-family: '微软雅黑';
-                    margin: 20px 0;
-                }
-                .el-table{
-                    .el-table__body-wrapper{
-                        height: 29vh;
+                padding: 0 20px !important;
+                .startDetail{
+                    .starttitleSty{
+                        font-size: 18px;
+                        font-family: Microsoft YaHei;
+                        font-weight: bold;
+                        color: #3B7AD1;
+                        // line-height: 12px;
+                        margin: 20px 0 20px 10px;
                     }
-                    .el-table__row{
-                        .cell{
-                            .el-input{
-                                height: 24px;
-                                .el-input__inner{
-                                    height: 24px;
+                    .danjuMsg{
+                        border: 1px solid #D6DBEA;
+                        padding: 10px 20px;
+                        border-radius: 10px;
+                        margin-bottom: 20px;
+                        .danjuMsg_data{
+                            padding: 5px 0 10px 0;
+                            .data_tit{
+                                margin-right: 10px;
+                                font-weight: bold;
+                                font-size: 14px;
+                                font-family: Microsoft YaHei;
+                                color: #8991B0;
+                            }
+                            .data_tit_wd{
+                                display: inline-block;
+                                width: 90px;
+                            }
+                            .el-form-item--small{
+                                .el-input{
+                                    height: 25px;
+                                    width: 160px;
+                                }
+                                margin-bottom: 0;
+                                .el-input-number{
+                                    height: 25px;
+                                    .el-input-number__decrease, .el-input-number__increase{
+                                        right: -39px;
+                                    }
                                 }
                             }
                         }
                     }
-                }
-                .danjuMsg{
-                    margin-top: 10px;
-                    .danjuMsg_data{
-                        margin: 0 0 10px 0;
-                        .data_tit{
-                            margin-right: 10px;
-                            font-weight: bold;
+                    .el-select, .el-input{
+                        width: 100%;
+                    }
+                    .detaTableBtns{
+                        display: flex;
+                        width: 500px;
+                        position: relative;
+                        top: 32px;
+                        left: 66vw;
+                        z-index: 11111;
+                        .tableBtn {
+                            display: flex;
+                            margin-right: 30px;
+                            img{
+                                margin-right: 5px;
+                                margin-top: 1px;
+                            }
+                            span{
+                                font-size: 14px;
+                                font-family: Microsoft YaHei;
+                                font-weight: 400;
+                            }
+                        }
+                        .add{
+                            cursor: no-drop;
+                            span{
+                                color: #3B7AD1;
+                            }
                         }
-                        .data_tit_wd{
-                            display: inline-block;
-                            width: 90px;
+                        .save{
+                            cursor: pointer;
+                            span{
+                                color: #50C14E;
+                            }
+                        }
+                        .edit{
+                            span{
+                                color: #F5A623;
+                            }
                         }
-                        .el-form-item--small{
-                            .el-input{
-                                height: 25px;
-                                width: 160px;
+                        .delete{
+                            cursor: no-drop;
+                            span{
+                                color: #F65177;
                             }
-                            margin-bottom: 0;
-                            .el-input-number{
-                                height: 25px;
-                                .el-input-number__decrease, .el-input-number__increase{
-                                    right: -39px;
+                        }
+                    }
+                    .el-tabs{
+                        .el-tabs__header{
+                            .el-tabs__nav{
+                                .el-tabs__item{
+                                    font-size: 18px;
+                                    font-family: Microsoft YaHei;
+                                    font-weight: bold;
+                                    margin: 0 10px;                                    
+                                    color: #8991B0;
+                                }
+                                .is-active{
+                                    font-size: 18px;
+                                    font-family: Microsoft YaHei;
+                                    font-weight: bold;
+                                    color: #3B7AD1;
+                                    margin: 0 10px;
+                                }
+                            }
+                        }
+                        
+                        .el-table{
+                            .el-table__body-wrapper{
+                                height: 40vh;
+                            }
+                            .el-table__row{
+                                .cell{
+                                    .el-input{
+                                        height: 24px;
+                                        .el-input__inner{
+                                            height: 24px;
+                                        }
+                                    }
                                 }
                             }
                         }
                     }
                 }
-                .el-select, .el-input{
-                    width: 100%;
-                }
             }
             .el-dialog__footer{
                 .dialog-footer{

+ 70 - 97
src/components/assessment/evaluationStartPage.vue

@@ -14,39 +14,20 @@
                 <el-button style="margin-left: 10px;" @click="reset">重置</el-button>
             </div>
             <div class="PeriodBtn">
-                <el-row :gutter="10" style="padding-left: 10px;">
-                    <el-col :span="1.5">
-                        <el-button
-                        type="primary"
-                        icon="Plus"
-                        size="mini"
-                        @click="handleAdd"
-                        >新增</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="danger"
-                        icon="Delete"
-                        size="mini"
-                        :disabled="deleteSelect.length === 0"
-                        @click="handleDelete"
-                        >批量删除</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="warning"
-                        icon="Download"
-                        size="mini"
-                        @click="handleExport"
-                        >导出</el-button>
-                    </el-col>
-                </el-row>
+                <btns
+                :showImport="false"
+                :showSave="false"
+                :disDelete="deleteSelect.length === 0"
+                @handleAdd="handleAdd"
+                @handleDelete="handleDelete"
+                @handleExport="handleExport"
+                ></btns>
             </div>
             <div class="evaluationStartTableData">
                 <el-table :data="evaluationStartData" style="width: 100%" @select="rowClick" @select-all="allSelect">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
-                    <el-table-column label="业务编号" prop="id" />
-                    <el-table-column label="考评单位" prop="organizationName" />
+                    <el-table-column label="业务编号" prop="responsibilityCode" width="300" />
+                    <el-table-column label="考评单位" prop="organizationName" width="330" />
                     <el-table-column label="业务类别">
                         <template #default="scope">
                             <span v-if="scope.row.checkCycle === 'YDKP'" style="font-size: 12px;">月度考评</span>
@@ -55,15 +36,18 @@
                         </template>
                     </el-table-column>
                     <el-table-column label="年度" prop="year" />
+                    <el-table-column label="月度/季度" prop="month" />
                     <el-table-column label="流程状态" prop="stage" />
                     <el-table-column label="业务简述" prop="des" />
-                    <el-table-column label="综合得分" prop="checkCycle" />
-                    <el-table-column label="考评排名" prop="beginDate" />
-                    <el-table-column label="考评评级" prop="endDate" />
+                    <!-- <el-table-column label="综合得分" prop="checkCycle" /> -->
+                    <el-table-column label="考核开始时间" prop="beginDate" />
+                    <el-table-column label="考核截止时间" prop="endDate" />
+                    <!-- <el-table-column label="考评排名" prop="beginDate" />
+                    <el-table-column label="考评评级" prop="endDate" /> -->
                     <el-table-column label="操作">
                         <template #default="scope">
-                            <p class="indicitem" @click="agetdeptresponsibility(scope.row)">启动</p>
-                            <!-- <p class="indicitem" @click="getDetail(scope.row)">明细</p> -->
+                            <p class="indicitem" v-if="scope.row.stage === '流程未启动'" @click="agetdeptresponsibility(scope.row)">启动</p>
+                            <p class="indicitem" v-else @click="getDetail(scope.row)">详情</p>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -99,7 +83,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="考评规则" prop="evaluateRule">
+                        <!-- <el-form-item label="考评规则" prop="evaluateRule">
                             <el-select v-model="ruleForm.evaluateRule"  placeholder="请选择考评规则">
                                 <el-option
                                 v-for="item in ruleDataAll"
@@ -108,8 +92,8 @@
                                 :value="item.id">
                                 </el-option>
                             </el-select>
-                        </el-form-item>
-                        <el-form-item label="年份" prop="year" v-if="isShowYear">
+                        </el-form-item> -->
+                        <el-form-item label="年份" prop="year">
                             <el-date-picker
                                 v-model="ruleForm.year"
                                 type="year"
@@ -117,7 +101,7 @@
                                 placeholder="请选择年份"
                                 />
                         </el-form-item>
-                        <el-form-item label="月份" v-else>
+                        <el-form-item label="月份" v-if="!isShowYear">
                             <el-input-number v-model="ruleForm.month" :min="1" :max="12" />
                         </el-form-item>
                         <el-form-item label="描述" prop="desc">
@@ -132,17 +116,19 @@
                     </span>
                 </template>
             </el-dialog>
-            <start-from-list ref="startFromDetail"></start-from-list>
         </div>
+        <start-from-list ref="startFromDetail"></start-from-list>
     </div>
 </template>
 
 <script>
 import startFromList from './evaluationStartFrom.vue'
-import {apiGetdeptresponsibilityList, apiGetdeptresponsibilitySave,apiGetdeptresponsibilitygenerate, apiGetOrganizationListAll, apiGetdatadictionaryList} from '../../api/api'
+import btns from '../elbuttonS.vue'
+import {apiGetdeptresponsibilityList, apiGetdeptresponsibilitySave,apiGetdeptresponsibilitygenerate, apiGetdatadictionaryList} from '../../api/api'
 export default {
     components: {
-        startFromList
+        startFromList,
+        btns
     },
     data() {
         return {
@@ -217,19 +203,6 @@ export default {
                 }
             })
         },
-        //查询所有考评规则
-        getRuleAllList() {
-            let that = this
-            let params = {
-                organizationType: that.ruleForm.organizationType,
-                evaluationCycle: that.ruleForm.evaluationCycle
-            }
-            apiGetOrganizationListAll(params).then(datas =>{
-                if (datas && datas.data) {
-                    that.ruleDataAll = datas.data
-                }
-            })            
-        },
         //考评周期
         getPeriodData() {
             let that = this
@@ -243,7 +216,6 @@ export default {
             })
         },
         chooseRule(val, type) {
-            this.getRuleAllList()
             if (type === '周期') {
                 if (val === 'YDKP' || val === 'JDKP') {
                     this.isShowYear = false
@@ -264,17 +236,16 @@ export default {
         saveAndEditIndicatorData() {
             let that = this
             let params = {
-                // organizationType: that.ruleForm.organizationType,
-                // evaluationCycle: that.ruleForm.evaluationCycle,
-                organizationEvaluationRuleId: that.ruleForm.evaluateRule,
+                organizationType: that.ruleForm.organizationType,
+                checkCycle: that.ruleForm.evaluationCycle,
+                // organizationEvaluationRuleId: that.ruleForm.evaluateRule,
+                year: that.ruleForm.year,
                 des: that.ruleForm.desc
             }
             if (that.isSave) {
                 params.id = this.evalradio.id
             }
-            if (that.isShowYear) {
-                params.year = that.ruleForm.year
-            } else {
+            if (!that.isShowYear) {
                 params.month = that.ruleForm.month
             }
             apiGetdeptresponsibilitySave(params).then(datas =>{
@@ -332,9 +303,11 @@ export default {
         },
         handleSizeChange(val){
             this.page.pagesize = val
+            this.getevaluStartList()
         },
         handleCurrentChange(val){
             this.page.currentPage =val
+            this.getevaluStartList()
         },
         rowClick(selection, row) {
             this.windframradio = {}
@@ -429,44 +402,44 @@ export default {
                 margin:0;
             }
         }
-    }
-  .evaluationStartTableData{
-    .el-table{
-        .el-table__body-wrapper{
-            height: 64vh !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;
+        .evaluationStartTableData{
+            .el-table{
+                .el-table__body-wrapper{
+                    height: 64vh !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;
-    }
-    }
-    .el-overlay{
-        .el-dialog{
-            .el-dialog__body{
-                padding: 30px 60px 30px 20px !important;
-                .periodFrom{
-                    .el-select, .el-input{
-                        width: 100%;
-                    }
-                    .el-input{
-                        height: 30px;
+        .el-overlay{
+            .el-dialog{
+                .el-dialog__body{
+                    padding: 30px 60px 30px 20px !important;
+                    .periodFrom{
+                        .el-select, .el-input{
+                            width: 100%;
+                        }
+                        .el-input{
+                            height: 30px;
+                        }
                     }
                 }
             }

+ 158 - 0
src/components/elbuttonS.vue

@@ -0,0 +1,158 @@
+<template>
+    <el-row :gutter="10" class="btnsA">
+        <el-col :span="1.5" v-if="showAdd">
+            <el-button
+            type="primary"
+            size="mini"
+            :disabled="disAdd"
+            @click="handleAdd"
+            >
+            <img :src="addW" style="margin-right: 10px">
+            <span>新增</span>
+            </el-button>
+        </el-col>
+        <el-col :span="1.5" v-if="showSave">
+            <el-button
+            type="success"
+            size="mini"
+            @click="handleEdit"
+            :disabled="disSave"
+            >
+            <img :src="editW" style="margin-right: 10px">
+            <span>修改</span>
+            </el-button>
+        </el-col>
+        <el-col :span="1.5" v-if="showDelete">
+            <el-button
+            type="danger"
+            size="mini"
+            :disabled="disDelete"
+            @click="handleDelete"
+            >
+            <img :src="deleteW" style="margin-right: 10px">
+            <span>删除</span>
+            </el-button>
+        </el-col>
+        <el-col :span="1.5" v-if="showImport">
+            <el-button
+            type="info"
+            icon="Upload"
+            size="mini"
+            :disabled="disImport"
+            @click="handleImport"
+            >导入</el-button>
+        </el-col>
+        <el-col :span="1.5" v-if="showExport">
+            <el-button
+            type="warning"
+            icon="Download"
+            size="mini"
+            :disabled="disExport"
+            @click="handleExport"
+            >导出</el-button>
+        </el-col>
+    </el-row>
+</template>
+
+<script>
+import addW from '../assets/btnIcon/addW.png'
+import editW from '../assets/btnIcon/editW.png'
+import deleteW from '../assets/btnIcon/deleteW.png'
+export default {
+    props: {
+        showAdd: {
+            type: Boolean,
+            default: () => {
+                return true;
+            },
+        },
+        disAdd: {
+            type: Boolean,
+            default: () => {
+                return false;
+            },
+        },
+        showSave: {
+            type: Boolean,
+            default: () => {
+                return true;
+            },
+        },
+        disSave: {
+            type: Boolean,
+            default: () => {
+                return false;
+            },
+        },
+        showDelete: {
+            type: Boolean,
+            default: () => {
+                return true;
+            },
+        },
+        disDelete: {
+            type: Boolean,
+            default: () => {
+                return false;
+            },
+        },
+        showImport: {
+            type: Boolean,
+            default: () => {
+                return true;
+            },
+        },
+        disImport: {
+            type: Boolean,
+            default: () => {
+                return false;
+            },
+        },
+        showExport: {
+            type: Boolean,
+            default: () => {
+                return true;
+            },
+        },
+        disExport: {
+            type: Boolean,
+            default: () => {
+                return false;
+            },
+        },
+    },
+    data() {
+        return {
+            addW: addW,
+            editW: editW,
+            deleteW: deleteW
+        }
+    },
+    methods: {
+        handleAdd() {
+            this.$emit('handleAdd')
+        },
+        handleEdit() {
+            this.$emit('handleEdit')
+        },
+        handleDelete() {
+            this.$emit('handleDelete')
+        },
+        handleImport() {
+            this.$emit('handleImport')
+        },
+        handleExport() {
+            this.$emit('handleExport')
+        },
+    }
+}
+</script>
+
+<style lang="less">
+.btnsA{
+    padding-left: 10px;
+    .is-disabled{
+        opacity: 0.5;
+    }
+}
+</style>

+ 17 - 48
src/components/evaluationSystem/evaluationCompanyPage.vue

@@ -10,51 +10,17 @@
                 <el-button style="margin-left: 10px;" @click="resetSeach">重置</el-button>
             </div>
             <div class="PeriodBtn">
-                <el-row :gutter="10" style="padding-left: 10px;">
-                    <el-col :span="1.5">
-                        <el-button
-                        type="primary"
-                        icon="Plus"
-                        size="mini"
-                        @click="handleAdd"
-                        >新增</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="success"
-                        icon="Edit"
-                        size="mini"
-                        @click="handleEdit"
-                        :disabled="changeDateSelect.length === 0 || changeDateSelect.length>1"
-                        >修改</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="danger"
-                        icon="Delete"
-                        size="mini"
-                        :disabled="changeDateSelect.length === 0"
-                        @click="handleDelete"
-                        >批量删除</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="info"
-                        icon="Upload"
-                        size="mini"
-                        disabled
-                        @click="handleImport"
-                        >导入</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="warning"
-                        icon="Download"
-                        size="mini"
-                        disabled
-                        >导出</el-button>
-                    </el-col>
-                </el-row>
+                <btns
+                :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
+                :disDelete="changeDateSelect.length === 0"
+                :disImport="true"
+                :disExport="true"
+                @handleAdd="handleAdd"
+                @handleEdit="handleEdit"
+                @handleDelete="handleDelete"
+                @handleImport="handleImport"
+                @handleExport="handleExport"
+                ></btns>
             </div>
             <div class="evaluationCompanyTableData">
                 <el-table :data="evaluationCompanyData" style="width: 100%" @select="rowClick" @select-all="rowClick">
@@ -139,7 +105,7 @@
                                     </el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="是否考">
+                            <el-form-item label="是否考">
                                 <el-radio-group v-model="ruleForm.isCheck">
                                     <el-radio border label="是" />
                                     <el-radio border label="否" />
@@ -186,10 +152,11 @@
 
 <script>
 import importDailog from '../importPage/importDailog.vue'
+import btns from '../elbuttonS.vue'
 import {apiGetOrganizationList, apiGetorganizationSaveList, apiGetorganizationdeleteList,apiGetorganizationgetTree,
  apiGetdatadictionaryList, apiGetbinstageList,apiGetbinsectionList, apiGetevaluateListAll} from '../../api/api'
 export default {
-  components: { importDailog },
+  components: { importDailog, btns },
     data() {
         return {
             dialogVisible: false,
@@ -376,7 +343,7 @@ export default {
                 evaluateRule: this.evalradio.evaluateRuleId.split(','),
                 binSection: this.evalradio.binSection,
                 binStage: this.evalradio.binStage.split(','),
-                isCheck: this.evalradio.scjyWeight?'是':'否',
+                isCheck: this.evalradio.isCheck?'是':'否',
                 scjyWeight: this.evalradio.scjyWeight,
                 qqWeight: this.evalradio.qqWeight,
                 jjWeight: this.evalradio.jjWeight,
@@ -492,9 +459,11 @@ export default {
         },
         handleSizeChange(val){
             this.page.pagesize = val
+            this.getEvalCompanyData()
         },
         handleCurrentChange(val){
             this.page.currentPage =val
+            this.getEvalCompanyData()
         },
         handleImport() {
             this.$refs.importPage.upload.title = "考评指标管理信息导入"

+ 15 - 46
src/components/evaluationSystem/evaluationDepartmentPage.vue

@@ -10,51 +10,17 @@
                 <el-button style="margin-left: 10px;" @click="resetSeach">重置</el-button>
             </div>
             <div class="PeriodBtn">
-                <el-row :gutter="10" style="padding-left: 10px;">
-                    <el-col :span="1.5">
-                        <el-button
-                        type="primary"
-                        icon="Plus"
-                        size="mini"
-                        @click="handleAdd"
-                        >新增</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="success"
-                        icon="Edit"
-                        size="mini"
-                        @click="handleEdit"
-                        :disabled="changeDateSelect.length === 0 || changeDateSelect.length>1"
-                        >修改</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="danger"
-                        icon="Delete"
-                        size="mini"
-                        :disabled="changeDateSelect.length === 0"
-                        @click="handleDelete"
-                        >批量删除</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="info"
-                        icon="Upload"
-                        size="mini"
-                        disabled
-                        @click="handleImport"
-                        >导入</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="warning"
-                        icon="Download"
-                        size="mini"
-                        disabled
-                        >导出</el-button>
-                    </el-col>
-                </el-row>
+                <btns
+                :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
+                :disDelete="changeDateSelect.length === 0"
+                :disImport="true"
+                :disExport="true"
+                @handleAdd="handleAdd"
+                @handleEdit="handleEdit"
+                @handleDelete="handleDelete"
+                @handleImport="handleImport"
+                @handleExport="handleExport"
+                ></btns>
             </div>
             <div class="evaluationDepartmentTableData">
                 <el-table :data="evaluationDepartmentData" style="width: 100%" @select="rowClick" @select-all="rowClick">
@@ -153,10 +119,11 @@
 
 <script>
 import importDailog from '../importPage/importDailog.vue'
+import btns from '../elbuttonS.vue'
 import {apiGetOrganizationList, apiGetorganizationSaveList, apiGetorganizationdeleteList, 
 apiGetdatadictionaryList,apiGetbinstageList,apiGetbinsectionList, apiGetevaluateListAll, apiGetorganizationstructureFromTree} from '../../api/api'
 export default {
-  components: { importDailog },
+  components: { importDailog, btns },
     data() {
         return {
             dialogVisible: false,
@@ -420,9 +387,11 @@ export default {
         },
         handleSizeChange(val){
             this.page.pagesize = val
+            this.getEvalCompanyData()
         },
         handleCurrentChange(val){
             this.page.currentPage =val
+            this.getEvalCompanyData()
         },
         handleImport() {
             this.$refs.importPage.upload.title = "考评指标管理信息导入"

+ 15 - 46
src/components/evaluationSystem/evaluationIndexPage.vue

@@ -10,51 +10,17 @@
                 <el-button style="margin-left: 10px;" @click="resetSeach">重置</el-button>
             </div>
             <div class="PeriodBtn">
-                <el-row :gutter="10" style="padding-left: 10px;">
-                    <el-col :span="1.5">
-                        <el-button
-                        type="primary"
-                        icon="Plus"
-                        size="mini"
-                        @click="handleAdd"
-                        >新增</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="success"
-                        icon="Edit"
-                        size="mini"
-                        @click="handleEdit"
-                        :disabled="changeDateSelect.length === 0 || changeDateSelect.length>1"
-                        >修改</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="danger"
-                        icon="Delete"
-                        size="mini"
-                        :disabled="changeDateSelect.length === 0"
-                        @click="handleDelete"
-                        >批量删除</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="info"
-                        icon="Upload"
-                        size="mini"
-                        disabled
-                        @click="handleImport"
-                        >导入</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                            type="warning"
-                            icon="Download"
-                            size="mini"
-                            disabled
-                        >导出</el-button>
-                    </el-col>
-                </el-row>
+                <btns
+                :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
+                :disDelete="changeDateSelect.length === 0"
+                :disImport="true"
+                :disExport="true"
+                @handleAdd="handleAdd"
+                @handleEdit="handleEdit"
+                @handleDelete="handleDelete"
+                @handleImport="handleImport"
+                @handleExport="handleExport"
+                ></btns>
             </div>
             <div class="evaluationIndexTableData">
                 <el-table :data="evaluationIndexData" style="width: 100%" @select="rowClick" @select-all="rowClick">
@@ -190,10 +156,11 @@
 <script>
 import importDailog from '../importPage/importDailog.vue'
 import indicatorItem from './IndicatorItemPage.vue'
+import btns from '../elbuttonS.vue'
 import {apiGetIndicatorList, apiGetIndicatorSave, apiGetIndicatorDelete,apiGetbinsectionList,
  apiGetIndicatorTypeList, apiGetdatadictionaryList, apiGetbinstageList} from '../../api/api'
 export default {
-  components: { importDailog, indicatorItem },
+  components: { importDailog, indicatorItem, btns },
     data() {
         return {
             dialogVisible: false,
@@ -450,9 +417,11 @@ export default {
         },
         handleSizeChange(val){
             this.page.pagesize = val
+            this.getEvaluationData()
         },
         handleCurrentChange(val){
             this.page.currentPage =val
+            this.getEvaluationData()
         },
         handleImport() {
             this.$refs.importPage.upload.title = "考评指标管理信息导入"

+ 15 - 46
src/components/evaluationSystem/evaluationPersonnelPage.vue

@@ -10,51 +10,17 @@
                 <el-button style="margin-left: 10px;" @click="resetSeach">重置</el-button>
             </div>
             <div class="PeriodBtn">
-                <el-row :gutter="10" style="padding-left: 10px;">
-                    <el-col :span="1.5">
-                        <el-button
-                        type="primary"
-                        icon="Plus"
-                        size="mini"
-                        @click="handleAdd"
-                        >新增</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="success"
-                        icon="Edit"
-                        size="mini"
-                        @click="handleEdit"
-                        :disabled="changeDateSelect.length === 0 || changeDateSelect.length>1"
-                        >修改</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="danger"
-                        icon="Delete"
-                        size="mini"
-                        :disabled="changeDateSelect.length === 0"
-                        @click="handleDelete"
-                        >批量删除</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="info"
-                        icon="Upload"
-                        size="mini"
-                        disabled
-                        @click="handleImport"
-                        >导入</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="warning"
-                        icon="Download"
-                        size="mini"
-                        disabled
-                        >导出</el-button>
-                    </el-col>
-                </el-row>
+                <btns
+                :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
+                :disDelete="changeDateSelect.length === 0"
+                :disImport="true"
+                :disExport="true"
+                @handleAdd="handleAdd"
+                @handleEdit="handleEdit"
+                @handleDelete="handleDelete"
+                @handleImport="handleImport"
+                @handleExport="handleExport"
+                ></btns>
             </div>
             <div class="evaluationPersonTableData">
                 <el-table :data="evaluationPersonData" style="width: 100%" @select="rowClick" @select-all="rowClick">
@@ -185,10 +151,11 @@
 
 <script>
 import importDailog from '../importPage/importDailog.vue'
+import btns from '../elbuttonS.vue'
 import {apiGetpersonnelList, apiGetpersonnelSaveList, apiGetpersonneldeleteList,
  apiGetevaluateListAll, apiGetorganizationgetTree, apiGetdatadictionaryList, apiGetuserListAll} from '../../api/api'
 export default {
-  components: { importDailog },
+  components: { importDailog, btns },
     data() {
         return {
             dialogVisible: false,
@@ -518,9 +485,11 @@ export default {
         },
         handleSizeChange(val){
             this.page.pagesize = val
+            this.getEvalpersonData()
         },
         handleCurrentChange(val){
             this.page.currentPage =val
+            this.getEvalpersonData()
         },
         handleImport() {
             this.$refs.importPage.upload.title = "考评指标管理信息导入"

+ 15 - 46
src/components/evaluationSystem/evaluationRulesPage.vue

@@ -10,51 +10,17 @@
                 <el-button style="margin-left: 10px;" @click="resetSeach">重置</el-button>
             </div>
             <div class="PeriodBtn">
-                <el-row :gutter="10" style="padding-left: 10px;">
-                    <el-col :span="1.5">
-                        <el-button
-                        type="primary"
-                        icon="Plus"
-                        size="mini"
-                        @click="handleAdd"
-                        >新增</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="success"
-                        icon="Edit"
-                        size="mini"
-                        @click="handleEdit"
-                        :disabled="changeDateSelect.length === 0 || changeDateSelect.length>1"
-                        >修改</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="danger"
-                        icon="Delete"
-                        size="mini"
-                        :disabled="changeDateSelect.length === 0"
-                        @click="handleDelete"
-                        >批量删除</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="info"
-                        icon="Upload"
-                        size="mini"
-                        disabled
-                        @click="handleImport"
-                        >导入</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                            type="warning"
-                            icon="Download"
-                            size="mini"
-                            disabled
-                        >导出</el-button>
-                    </el-col>
-                </el-row>
+                <btns
+                :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
+                :disDelete="changeDateSelect.length === 0"
+                :disImport="true"
+                :disExport="true"
+                @handleAdd="handleAdd"
+                @handleEdit="handleEdit"
+                @handleDelete="handleDelete"
+                @handleImport="handleImport"
+                @handleExport="handleExport"
+                ></btns>
             </div>
             <div class="evaluationRuleTableData">
                 <el-table :data="evaluationRuleData" style="width: 100%" @select="rowClick" @select-all="rowClick">
@@ -133,9 +99,10 @@
 <script>
 import importDailog from '../importPage/importDailog.vue'
 import ruleDetailPage from './ruleDetailPage.vue'
+import btns from '../elbuttonS.vue'
 import {apiGetevaluateRuleList, apiGetevaluateRuleSaveList, apiGetevaluateRuledeleteList, apiGetbinsectionList, apiGetbinstageList} from '../../api/api'
 export default {
-    components: { importDailog, ruleDetailPage },
+    components: { importDailog, ruleDetailPage, btns },
     data() {
         return {
             dialogVisible: false,
@@ -324,9 +291,11 @@ export default {
         },
         handleSizeChange(val){
             this.page.pagesize = val
+            this.getEvalRuleData()
         },
         handleCurrentChange(val){
             this.page.currentPage =val
+            this.getEvalRuleData()
         },
         handleImport() {
             this.$refs.importPage.upload.title = "考评指标管理信息导入"

+ 15 - 46
src/components/knowledgePage/scoringRulesPage.vue

@@ -17,51 +17,17 @@
                 <el-button style="margin-left: 10px;" @click="reset">重置</el-button>
             </div>
             <div class="PeriodBtn">
-                <el-row :gutter="10" style="padding-left: 10px;">
-                    <el-col :span="1.5">
-                        <el-button
-                        type="primary"
-                        icon="Plus"
-                        size="mini"
-                        @click="handleAdd"
-                        >新增</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="success"
-                        icon="Edit"
-                        size="mini"
-                        @click="handleEdit"
-                        :disabled="changeDateSelect.length === 0 || changeDateSelect.length > 1"
-                        >修改</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="danger"
-                        icon="Delete"
-                        size="mini"
-                        :disabled="changeDateSelect.length === 0"
-                        @click="handleDelete"
-                        >批量删除</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="info"
-                        icon="Upload"
-                        size="mini"
-                        disabled
-                        @click="handleImport"
-                        >导入</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                        type="warning"
-                        icon="Download"
-                        size="mini"
-                        disabled
-                        >导出</el-button>
-                    </el-col>
-                </el-row>
+                <btns
+                :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
+                :disDelete="changeDateSelect.length === 0"
+                :disImport="true"
+                :disExport="true"
+                @handleAdd="handleAdd"
+                @handleEdit="handleEdit"
+                @handleDelete="handleDelete"
+                @handleImport="handleImport"
+                @handleExport="handleExport"
+                ></btns>
             </div>
             <div class="scoringRulesTableData">
                 <el-table :data="scoringRulesData" style="width: 100%" @select="rowClick" @select-all="allSelect">
@@ -137,9 +103,10 @@
 <script>
 import importDailog from '../importPage/importDailog.vue'
 import scoringRulesDetailPage from './scoringRulesDetailPage.vue'
+import btns from '../elbuttonS.vue'
 import {apiGetevaluationscoringruleList, apiGetindicatorListAll, apiGetbinsectionList, apiGetevaluationscoringSaveList, apiGetevaluationruleRemove} from '../../api/api'
 export default {
-  components: { importDailog, scoringRulesDetailPage },
+  components: { importDailog, scoringRulesDetailPage, btns },
     data() {
         return {
             dialogVisible: false,
@@ -341,9 +308,11 @@ export default {
         },
         handleSizeChange(val){
             this.page.pagesize = val
+            this.getEvalscoringData()
         },
         handleCurrentChange(val){
             this.page.currentPage =val
+            this.getEvalscoringData()
         },
         rowClick(selection, row) {
             this.changeDateSelect = selection

+ 1 - 1
src/components/menuTreeconfig.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
     <template v-for="menu in this.menuData">
-      <el-sub-menu :key="menu.index" :index="menu.index" v-if="menu.children">
+      <el-sub-menu :key="menu.index" :index="menu.index" v-if="menu.children" :disabled="menu.index === '' ? true : false">
           <template #title>
               <!-- <i :class="menu.icon"></i> -->
               <img :src="menu.img" v-if="menu.index === '1'">

+ 1 - 1
src/views/homePage.vue

@@ -214,7 +214,7 @@ export default {
                     name: '考评首页'
                 }
             ]
-            this.$router.push({ path: this.routeTags[0].path})
+            this.$router.push({ path: this.routeTags[0].index})
             window.localStorage.setItem('routeTags', JSON.stringify(this.routeTags))
         }