SunZehao 1 vuosi sitten
vanhempi
commit
85a70de521

+ 1 - 1
src/components/assessment/assessmentApplicationPage.vue

@@ -298,7 +298,7 @@ export default {
             let deptLeaderName = ''
             that.departData.forEach(itv =>{
                 if (itv.id === that.ruleForm.deptName) {
-                    deptName = itv.keyName
+                    deptName = itv.name
                 }
             })
             that.deptLeaderOption.forEach(it =>{

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

@@ -17,8 +17,8 @@
                 :showImport="false"
                 :showExport="false"
                 :showSave="false"
-                :showAdd="true"
-                :showDelete="true"
+                :showAdd="false"
+                :showDelete="false"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"
                 :disExport="true"

+ 6 - 5
src/components/assessment/evaluationDeptRatingPage.vue

@@ -31,7 +31,8 @@
                 ></btns>
             </div>
             <div class="evaluationRatingTableData">
-                <el-table :data="evaluationRatingData.length>0?evaluationRatingData.slice((page.currentPage-1)*page.pagesize, page.currentPage*page.pagesize):evaluationRatingData" style="width: 100%" @select="rowClick" @select-all="rowClick">
+                <!-- .length>0?evaluationRatingData.slice((page.currentPage-1)*page.pagesize, page.currentPage*page.pagesize):evaluationRatingData -->
+                <el-table :data="evaluationRatingData" 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="序号" align="center"></el-table-column>
                     <el-table-column label="考评部门" width="200">
@@ -61,14 +62,14 @@
                     </el-table-column>
                     <el-table-column label="A级总数" prop="acount" />
                 </el-table>
-                <el-pagination
+                <!-- <el-pagination
                     @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"
                     :current-page="page.currentPage"
                     :page-size="page.pagesize"
                     layout="total, prev, pager, next, jumper"
                     :total="page.total">
-                </el-pagination>
+                </el-pagination> -->
             </div>
             <el-dialog :title="title" custom-class="startToDia" v-model="dialogVisible" width="600px" :close-on-click-modal="false">
                 <div class="periodFrom">
@@ -334,7 +335,7 @@ export default {
             apiGetevaluationdeptratinglist(params).then(datas =>{
                 if (datas && datas.data) {
                     that.evaluationRatingData = datas.data
-                    that.page.total = datas.data.length
+                    // that.page.total = datas.data.length
                 }
             })
         },
@@ -707,7 +708,7 @@ export default {
         .evaluationRatingTableData{
             .el-table{
                 .el-table__body-wrapper{
-                    height: 60vh !important;
+                    height: 65vh !important;
                 }
                 .el-input__inner{
                     height: 30px !important;

+ 1 - 0
src/components/gateWay/gatewayNewYearFrom.vue

@@ -222,6 +222,7 @@ export default {
                             color: #F65177;
                         }
                         span:nth-child(4){
+                            width: 10%;
                             font-weight: 600;
                             color: #666;
                         }