From 0ba75db34c554959c6bc566a38a22db34913c797 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 九月 2023 17:38:49 +0800
Subject: [PATCH] modified: src/views/CNAS/nonConformanceManage/index.vue modified: src/views/CNAS/reviewAnnualPlan/index.vue modified: src/views/CNAS/satisfactionSurveys/index.vue modified: src/views/basicData/index.vue modified: src/views/chart/work/index.vue modified: src/views/experiment/checkTheReport/index.vue modified: src/views/experiment/inspectionApplication/index.vue modified: src/views/experiment/nonConformingFeedback/index.vue modified: src/views/experiment/passRateStatistics/index.vue modified: src/views/experiment/planAssignments/plan.vue modified: src/views/experiment/reportAuditing/index.vue modified: src/views/inspectionManagement/commissionInspection/index.vue modified: src/views/inspectionManagement/reportForInspection/index.vue modified: src/views/laboratory/gather/index.vue modified: src/views/laboratory/ledger/index.vue modified: src/views/laboratory/measure/index.vue modified: src/views/laboratory/personnel/index.vue modified: src/views/laboratory/role/index.vue modified: src/views/message/toDo/index.vue modified: src/views/standardLibrary/index.vue
---
src/views/laboratory/measure/index.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 427e4d7..58e18c7 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -2,32 +2,32 @@
<div>
<div class="content-main">
<div class="top-bar">
- <el-form :hidden="lookVisible" ref="form" :inline="true" :model="searchData">
+ <el-form style="margin-top: 10px;" :hidden="lookVisible" ref="form" :inline="true" :model="searchData">
<el-form-item :label="this.radioValue === 0 ? '浠櫒璁惧缂栧彿:' : '璁″垝缂栧彿:'" class="sermargin">
- <el-input v-model="searchData.code" @blur="blurSearch()" class="input-form" placeholder="璇疯緭鍏�">
+ <el-input size="small" v-model="searchData.code" @blur="blurSearch()" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
<el-form-item v-if="this.radioValue === 1">
- <el-button type="primary" @click="searchPlan">鏌ヨ</el-button>
+ <el-button size="small" type="primary" @click="searchPlan">鏌ヨ</el-button>
</el-form-item>
<el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '浠櫒璁惧鍚嶇О:' : '璁惧鍚嶇О'"
class="sermargin">
- <el-input v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏�">
+ <el-input size="small" v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
<el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '璁￠噺鍗曚綅:' : '璁￠噺鍗曚綅锛�'"
style="margin-right: 20px;">
- <el-input v-model="searchData.measureunit" class="input-form" placeholder="璇疯緭鍏�">
+ <el-input size="small" v-model="searchData.measureunit" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
</el-form>
- <el-form :hidden="lookVisible">
+ <el-form :hidden="lookVisible" style="margin-top: 10px;">
<el-form-item v-if="this.radioValue === 0" class="rightBtn">
- <el-button type="primary" @click="search">鏌ヨ</el-button>
- <el-button type="primary" plain @click="reset()">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="search">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="reset()">閲嶇疆</el-button>
</el-form-item>
<el-form-item v-if="this.radioValue === 1" class="rightBtn">
- <el-button type="primary" @click="addPlan()" icon="el-icon-plus">鏂板璁″垝</el-button>
+ <el-button size="small" type="primary" @click="addPlan()" icon="el-icon-plus">鏂板璁″垝</el-button>
</el-form-item>
</el-form>
</div>
@@ -126,7 +126,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>
@@ -396,7 +396,8 @@
});
this.lookVisible = false
this.addBtn = false
- this.limitGetPlanMeasureInstrument()
+ // this.limitGetPlanMeasureInstrument()
+ this.getPlanPageList()
},
async handleSizeChangePlan(num) {
this.pageSizePlan = num
@@ -520,7 +521,7 @@
this.reset()
},
async getPlanPageList() {
- console.log(111);
+ // console.log(111);
let param = {
currentPage: this.currentPage,
pageSize: this.pageSize,
--
Gitblit v1.9.3