浏览代码

配合后端修改问题,新增字段;优化单位考评目标启动详情页面和月季度考评详情页面展示问题;

SunZehao 2 年之前
父节点
当前提交
106579fdc2

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

@@ -19,7 +19,7 @@
                 :showImport="false"
                 :showExport="false"
                 :showSave="false"
-                :showAdd="true"
+                :showAdd="$utils.havePurview('evaluationQuarter:oneLevel:add')"
                 :showDelete="$utils.havePurview('evaluationQuarter:oneLevel:delete')"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"

+ 37 - 5
src/components/assessment/evaluationStartFrom.vue

@@ -69,7 +69,7 @@
                 </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 :data="quantifiedList.slice((pageLeft.currentPage-1)*pageLeft.pagesize, pageLeft.currentPage*pageLeft.pagesize)" 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="organizationShortName" width="300" />
@@ -98,9 +98,16 @@
                                 </template>
                             </el-table-column>
                         </el-table>
+                        <el-pagination
+                            @current-change="handleCurrentChangeLeft"
+                            :current-page="pageLeft.currentPage"
+                            :page-size="pageLeft.pagesize"
+                            layout="total, prev, pager, next, jumper"
+                            :total="pageLeft.total">
+                        </el-pagination>
                     </el-tab-pane>
                     <el-tab-pane label="考评评价指标内容" name="second">
-                        <el-table :data="nonQuantifiedList" style="width: 100%">
+                        <el-table :data="nonQuantifiedList.slice((pageRight.currentPage-1)*pageRight.pagesize, pageRight.currentPage*pageRight.pagesize)" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
                             <el-table-column label="单位名称" prop="organizationShortName" width="300">
                                 <template #default="scope">
@@ -200,6 +207,13 @@
                                 </template>
                             </el-table-column>
                         </el-table>
+                        <el-pagination
+                            @current-change="handleCurrentChangeRight"
+                            :current-page="pageRight.currentPage"
+                            :page-size="pageRight.pagesize"
+                            layout="total, prev, pager, next, jumper"
+                            :total="pageRight.total">
+                        </el-pagination>
                     </el-tab-pane>
                 </el-tabs>
                 
@@ -260,7 +274,17 @@ export default {
             indicItemoptions: [],
             sectionNameArr: [],
             deptNameArr: [],
-            statusData: []
+            statusData: [],
+            pageLeft:{
+                pagesize: 15,
+                currentPage: 1,
+                total: 0
+            },
+            pageRight:{
+                pagesize: 15,
+                currentPage: 1,
+                total: 0
+            },
         }
     },
     created() {
@@ -374,6 +398,12 @@ export default {
         rowClick(selection, row) {
             this.changeDateSelect = selection
         },
+        handleCurrentChangeLeft(val) {
+            this.pageLeft.currentPage = val
+        },
+        handleCurrentChangeRight(val) {
+            this.pageRight.currentPage = val
+        },
         //获取详情
         getDetails(id) {
             let that = this
@@ -385,7 +415,7 @@ export default {
             apiGetdeptresponDetail(params).then(datas =>{
                 if (datas && datas.data) {
                     that.quantifiedList = datas.data.quantifiedList
-                    // let nonarr = []
+                    that.pageLeft.total = datas.data.quantifiedList.length
                     if (datas.data.nonQuantifiedList.length>0) {
                         datas.data.nonQuantifiedList.forEach(it =>{
                             it.childName = it.indicatorName //指标id
@@ -393,6 +423,7 @@ export default {
                         })
                     }
                     that.nonQuantifiedList = datas.data.nonQuantifiedList.length>0?datas.data.nonQuantifiedList:[]
+                    that.pageRight.total = datas.data.nonQuantifiedList.length
                 }
             })
         },
@@ -697,8 +728,9 @@ export default {
                         }
                         
                         .el-table{
+                            margin-bottom: 10px;
                             .el-table__body-wrapper{
-                                height: 55vh;
+                                height: 50vh;
                             }
                             .el-table__row{
                                 .cell{

+ 37 - 5
src/components/assessment/monthQuarterFrom.vue

@@ -73,7 +73,7 @@
                 </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 :data="quantifiedList.slice((pageLeft.currentPage-1)*pageLeft.pagesize, pageLeft.currentPage*pageLeft.pagesize)" ref="table" 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" />
@@ -103,9 +103,16 @@
                                 </template>
                             </el-table-column>
                         </el-table>
+                        <el-pagination
+                            @current-change="handleCurrentChangeLeft"
+                            :current-page="pageLeft.currentPage"
+                            :page-size="pageLeft.pagesize"
+                            layout="total, prev, pager, next, jumper"
+                            :total="pageLeft.total">
+                        </el-pagination>
                     </el-tab-pane>
                     <el-tab-pane label="考评评价指标内容" name="second">
-                        <el-table :data="nonQuantifiedList" style="width: 100%">
+                        <el-table :data="nonQuantifiedList.slice((pageRight.currentPage-1)*pageRight.pagesize, pageRight.currentPage*pageRight.pagesize)" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
                             <el-table-column label="单位名称" prop="organizationShortName" width="300">
                                 <template #default="scope">
@@ -210,6 +217,13 @@
                                 </template>
                             </el-table-column>
                         </el-table>
+                        <el-pagination
+                            @current-change="handleCurrentChangeRight"
+                            :current-page="pageRight.currentPage"
+                            :page-size="pageRight.pagesize"
+                            layout="total, prev, pager, next, jumper"
+                            :total="pageRight.total">
+                        </el-pagination>
                     </el-tab-pane>
                 </el-tabs>
                 
@@ -264,7 +278,17 @@ export default {
             exportIcon: exportIcon,
             importIcon: importIcon,
             rowMsg: {},
-            statusData: []
+            statusData: [],
+            pageLeft:{
+                pagesize: 15,
+                currentPage: 1,
+                total: 0
+            },
+            pageRight:{
+                pagesize: 15,
+                currentPage: 1,
+                total: 0
+            },
         }
     },
     created() {
@@ -308,6 +332,12 @@ export default {
         rowClick(selection, row) {
             this.changeDateSelect = selection
         },
+        handleCurrentChangeLeft(val) {
+            this.pageLeft.currentPage = val
+        },
+        handleCurrentChangeRight(val) {
+            this.pageRight.currentPage = val
+        },
         //获取详情
         getDetails(id) {
             let that = this
@@ -319,7 +349,9 @@ export default {
             apiGetOrgEvalInfoList(params).then(datas =>{
                 if (datas && datas.data) {
                     that.quantifiedList = datas.data.quantifiedList
+                    that.pageLeft.total = datas.data.quantifiedList.length
                     that.nonQuantifiedList = datas.data.nonQuantifiedList.length>0?datas.data.nonQuantifiedList:[]
+                    that.pageRight.total = datas.data.nonQuantifiedList.length
                 }
             })
         },
@@ -649,10 +681,10 @@ export default {
                                 }
                             }
                         }
-                        
                         .el-table{
+                            margin-bottom: 10px;
                             .el-table__body-wrapper{
-                                height: 55vh;
+                                height: 50vh;
                             }
                             .el-table__row{
                                 .cell{

+ 2 - 2
src/utils/baseUrl.js

@@ -17,8 +17,8 @@ switch (process.env.NODE_ENV) {
  
     case 'production': 
         // baseUrl.ROOT = "http://123.60.219.66:28800/" 
-        baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
-        // baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
+        // baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
+        baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
         break 
 }