From a6e40623481eb57531439d4a93eadae280278acd Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 04 九月 2023 18:03:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.73.113:9001/r/lims-before
---
src/views/laboratory/measure/index.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index f9dd75a..427e4d7 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -42,7 +42,7 @@
</div>
</div>
<div class="table-box">
- <el-table v-if="this.radioValue == 0" :max-height="800" :cell-style="{ textAlign: 'left' }"
+ <el-table v-if="this.radioValue == 0" :max-height="500" :cell-style="{ textAlign: 'left' }"
:header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
:data="measureLedgerTable" style="width: 100%">
<el-table-column type="index" min-width="10%" />
@@ -81,7 +81,7 @@
</template>
</el-table-column>
</el-table>
- <el-table v-show="this.radioValue == 1" :max-height="800" :cell-style="{ textAlign: 'center' }"
+ <el-table v-show="this.radioValue == 1" :max-height="500" :cell-style="{ textAlign: 'center' }"
:header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
:data="measurePlanTable" style="width: 100%">
<el-table-column type="index" min-width="10%" />
@@ -114,7 +114,7 @@
<!-- 鍒嗛〉鍣� -->
<div style="display: flex;justify-content: end;padding: 10px 0;">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
- :current-page="currentPage" :page-sizes="[5, 10, 20]" :page-size="pageSize"
+ :current-page="currentPage" :page-sizes="[10, 20, 30]" :page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination>
</div>
@@ -328,10 +328,10 @@
measureLedgerTable: [],
measurePlanTable: [],
currentPage: 1,
- pageSize: 5,
+ pageSize: 10,
total: 0,
currentPagePlan: 1,
- pageSizePlan: 5,
+ pageSizePlan: 10,
totalPlan: 0,
direction: 'rtl',
lookVisible: false,
@@ -396,7 +396,7 @@
});
this.lookVisible = false
this.addBtn = false
- this.getPlanPageList()
+ this.limitGetPlanMeasureInstrument()
},
async handleSizeChangePlan(num) {
this.pageSizePlan = num
@@ -520,6 +520,7 @@
this.reset()
},
async getPlanPageList() {
+ console.log(111);
let param = {
currentPage: this.currentPage,
pageSize: this.pageSize,
@@ -531,6 +532,7 @@
})
this.measurePlanTable = res.data.list
this.total = res.data.total
+ console.log(333);
},
async lookMeasurement(code) {
},
--
Gitblit v1.9.3