From 5fa8dc320c2d2ec68fb0392f7e52cb49874b2bff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 16:47:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/views/laboratory/measure/index.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 1bb43b8..5c78cf1 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -8,6 +8,7 @@
</el-input>
</el-form-item>
<el-form-item v-if="this.radioValue === 1">
+ <!-- <el-col :span="12"><span hidden>2121</span></el-col> -->
<el-button type="primary" @click="searchPlan">鏌ヨ</el-button>
</el-form-item>
<el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '浠櫒璁惧鍚嶇О:' : '璁惧鍚嶇О'"
@@ -42,8 +43,8 @@
</div>
</div>
<div class="table-box">
- <el-table v-if="this.radioValue == 0" :max-height="800" :cell-style="{ textAlign: 'center' }"
- :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ <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%" />
<el-table-column prop="equipmentCode" label="浠櫒璁惧缂栧彿" min-width="10%" />
@@ -81,7 +82,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 +115,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>
@@ -126,7 +127,7 @@
size="mini" plain>杩斿洖</el-button>
<div v-if="addBtn"
style="display: flex;justify-content: center;width: 10%;position: fixed;top: 43px;right: 14px; z-index: 1000;">
- <el-button @click="addTop = -82; addBtn = false" size="mini" style="width: 60px;">杩斿洖</el-button>
+ <el-button @click="addTop = -82; addBtn = false;lookVisible= false" size="mini" style="width: 60px;">杩斿洖</el-button>
<el-button size="mini" @click="measureAdd" style="width: 60px;" type="primary">淇濆瓨</el-button>
</div>
</div>
@@ -328,10 +329,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 +397,8 @@
});
this.lookVisible = false
this.addBtn = false
- this.limitGetPlanMeasureInstrument()
+ // this.limitGetPlanMeasureInstrument()
+ this.getPlanPageList()
},
async handleSizeChangePlan(num) {
this.pageSizePlan = num
@@ -520,6 +522,7 @@
this.reset()
},
async getPlanPageList() {
+ // console.log(111);
let param = {
currentPage: this.currentPage,
pageSize: this.pageSize,
@@ -531,6 +534,7 @@
})
this.measurePlanTable = res.data.list
this.total = res.data.total
+ console.log(333);
},
async lookMeasurement(code) {
},
--
Gitblit v1.9.3