From 2bd7979e7b7db44df83847f800695ee2188146a9 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 01 九月 2023 09:11:54 +0800
Subject: [PATCH] modified: .env.development modified: src/views/experiment/inspectionApplication/index.vue modified: src/views/experiment/reportAuditing/index.vue modified: src/views/inspectionManagement/commissionInspection/index.vue
---
src/views/laboratory/measure/index.vue | 86 ++++++++++++++++++++++++++++--------------
1 files changed, 57 insertions(+), 29 deletions(-)
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index c32c063..1bb43b8 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -7,6 +7,9 @@
<el-input 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-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="璇疯緭鍏�">
@@ -70,10 +73,10 @@
<el-table-column prop="name" label="璐熻矗浜�" min-width="10%" />
<el-table-column prop="createTime" label="鍒涘缓鏃ユ湡" min-width="10%" />
<el-table-column prop="name" label="鍒涘缓浜�" min-width="8%" />
- <el-table-column prop="code" label="璁￠噺缂栧彿" min-width="8%" />
+ <el-table-column prop="code" label="璁￠噺缂栧彿" min-width="12%" />
<el-table-column label="鎿嶄綔" min-width="15%">
<template slot-scope="scope">
- <el-button type="text" @click="lookMeasurement(scope.row.equipmentCode)" size="small">鏌ョ湅璁￠噺灞ュ巻</el-button>
+ <!-- <el-button type="text" @click="lookMeasurement(scope.row.equipmentCode)" size="small">鏌ョ湅璁￠噺灞ュ巻</el-button> -->
<el-button type="text" size="small">鏌ョ湅闄勪欢</el-button>
</template>
</el-table-column>
@@ -109,7 +112,7 @@
</el-table-column>
</el-table>
<!-- 鍒嗛〉鍣� -->
- <div style="display: flex;justify-content: end;">
+ <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"
layout="total, sizes, prev, pager, next, jumper" :total="total">
@@ -117,12 +120,22 @@
</div>
</div>
</div>
+ <div>
+ <el-button v-if="selectInfoBtn" @click="combackLookPlan"
+ style="position: fixed;top: 43px;right: 14px; z-index: 1000;" type="primary" icon="el-icon-refresh-left"
+ 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 size="mini" @click="measureAdd" style="width: 60px;" type="primary">淇濆瓨</el-button>
+ </div>
+ </div>
<div
- :style="`position: absolute;top:${addTop}px;left: 9px;transition: 1s;width: 99%;height: 82vh;background-color: #fff;z-index: 21;`">
+ :style="`position: absolute;top:${addTop}vh;left: 9px;transition: 1s;width: 99%;height: 82vh;background-color: #fff;z-index: 21;`">
<Add ref="add" />
</div>
<div id="myMOdel"
- :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 99%; height: 85vh; background-color: #fff;z-index: 20;`">
+ :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 99%; height: 100vh; background-color: #fff;z-index: 20;`">
<el-col :span="10">
<p style="font-size: 13px;padding-left: 40px;">璁″垝淇℃伅</p>
</el-col>
@@ -150,7 +163,7 @@
</el-col>
</el-col>
<el-col style="width:93%;height: 20vh;margin-top: 30px; margin-left: 40px;">
- <el-table :data="measureData">
+ <el-table max-height="300" :data="measureData">
<el-table-column type="index" label="搴忓彿" />
<el-table-column prop="equipmentCode" label="浠櫒璁惧缂栧彿" />
<el-table-column prop="equipmentName" label="浠櫒璁惧鍚嶇О" />
@@ -276,6 +289,8 @@
return {
dialogVisible: false,
tableIndex: null,
+ selectInfoBtn: false,
+ addBtn: false,
measureUpInfo: {
id: null,
code: null,
@@ -329,8 +344,8 @@
createPerson: '鏌愭煇璐熻矗浜�',
createTime: '2021-09-08'
},
- mymodelTop: -700,//14
- addTop: -700,
+ mymodelTop: -1000,//14
+ addTop: -85,
planId: 0
}
},
@@ -369,29 +384,34 @@
this.measureUpInfo.remarks = scope.row.remarks
this.measureUpInfo.termValidity = scope.row.termValidity
},
- measureAdd() {
- let add = this.$refs.add.add()
- if (add) {
- this.addTop = -700
- this.$message({
- message: '鎿嶄綔鎴愬姛锛�',
- type: 'success'
- });
- this.lookVisible = false
+ async measureAdd() {
+ let res = await this.$refs.add.add()
+ if (!res) {
+ return
}
+ this.addTop = -82
+ this.$message({
+ message: '鎿嶄綔鎴愬姛锛�',
+ type: 'success'
+ });
+ this.lookVisible = false
+ this.addBtn = false
+ this.limitGetPlanMeasureInstrument()
},
async handleSizeChangePlan(num) {
this.pageSizePlan = num
+ this.currentPage
await this.limitGetPlanMeasureInstrument()
},
- async handleCurrentChangePllan(num) {
- this.currentPagePlan = num
- await this.limitGetPlanMeasureInstrument()
+ handleCurrentChangePllan(num) {
+ this.currentPagePlan = num;
+ this.limitGetPlanMeasureInstrument();
},
addPlan() {
- this.addTop = 14
+ this.addTop = 2
this.lookVisible = true
this.$parent.mainShowAdd()
+ this.addBtn = true
},
async limitGetPlanMeasureInstrument() {
let param = {
@@ -399,15 +419,18 @@
currentPage: this.currentPagePlan,
pageSize: this.pageSizePlan
}
- let res = await limitGetPlanMeasureRequest(param)
- this.totalPlan = res.data.taotal
- this.measureData = res.data.list
+ const res = await limitGetPlanMeasureRequest(param);
+ console.log(res.data.total);
+ // this.totalPlan = res.data.taotal;
+ this.measureData = res.data.list;
+ console.log(this.totalPlan);
},
lookPalan(id) {
this.planId = id
this.getPlanAndInfoAndIns(id)
this.lookVisible = true
- this.mymodelTop = 10
+ this.mymodelTop = 2
+ this.selectInfoBtn = true
this.$parent.triggerMainBtnPlan()
},
async getPlanAndInfoAndIns(id) {
@@ -428,7 +451,8 @@
},
combackLookPlan() {
this.lookVisible = false
- this.mymodelTop = -700
+ this.mymodelTop = -1000
+ this.selectInfoBtn = false
},
blurSearch() {
if (this.radioValue === 1) {
@@ -483,6 +507,9 @@
search() {
this.getStandingPageList()
},
+ searchPlan(){
+ this.getPlanPageList()
+ },
reset(formName) {
this.searchData.name = ''
this.searchData.code = ''
@@ -494,8 +521,9 @@
},
async getPlanPageList() {
let param = {
- currentPage: this.currentPage, pageSize: this.pageSize,
- code: this.searchData.code, name: this.searchData.name, unit: this.searchData.measureunit
+ currentPage: this.currentPage,
+ pageSize: this.pageSize,
+ plannedOrderNumber: this.searchData.code
}
const res = await getPlanPageList(param)
res.data.list.forEach(item => {
@@ -510,7 +538,7 @@
}
</script>
-<style scoped>
+<style scoped lang="scss">
.top-bar {
margin: -25px -15px;
background: #fff;
--
Gitblit v1.9.3