From 11ac298bee480de689c8ffc6de01d8ff766657a2 Mon Sep 17 00:00:00 2001
From: yuyu <1981343953@qq.com>
Date: 星期五, 18 八月 2023 17:07:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/laboratory/measure/index.vue | 205 +++++++++++++++++++++++++--------------------------
1 files changed, 100 insertions(+), 105 deletions(-)
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index a9bd91e..0330afc 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -3,7 +3,7 @@
<div class="content-main">
<div class="top-bar">
<el-form :hidden="lookVisible" ref="form" :inline="true" :model="searchData">
- <el-form-item :label="this.radioValue === 0 ? '浠櫒璁惧缂栧彿:' : '璁″垝鍗曞彿:'" class="sermargin">
+ <el-form-item :label="this.radioValue === 0 ? '浠櫒璁惧缂栧彿:' : '璁″垝缂栧彿:'" class="sermargin">
<el-input v-model="searchData.code" @blur="blurSearch()" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
@@ -82,7 +82,7 @@
: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%" />
- <el-table-column prop="plannedOrderNumber" label="璁″垝鍗曞彿" min-width="10%" />
+ <el-table-column prop="plannedOrderNumber" label="璁″垝缂栧彿" min-width="10%" />
<el-table-column prop="palanDate" label="璁″垝鏃ユ湡" min-width="10%">
<template lot-scope="scope">
<!-- {{ scope.row.palanDate }} -->
@@ -117,11 +117,11 @@
</div>
</div>
</div>
- <el-drawer title="鎴戞槸鏍囬" :visible.sync="drawer" :direction="direction" :before-close="handleClose">
- <span>鎴戞潵鍟�!</span>
- </el-drawer>
+ <div style="position: absolute;top:14px;left: 9px;transition: 1s;width: 100%;height: 82vh;background-color: #fff;z-index: 21;">
+ <Add/>
+ </div>
<div id="myMOdel"
- :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 100%; height: 60vh; background-color: #fff;z-index: 20;`">
+ :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 100%; height: 65vh; background-color: #fff;z-index: 20;`">
<el-col :span="10">
<p style="font-size: 13px;padding-left: 40px;">璁″垝淇℃伅</p>
</el-col>
@@ -130,7 +130,7 @@
<el-form-item>
<el-col :span="8">璁″垝缂栧彿锛�<span style="color: black;">{{ planInfo.plannedOrderNumber }}</span></el-col>
<el-col :span="8">璐熻矗浜猴細<span style="color: black;">{{ planInfo.measurePerson }}</span></el-col>
- <el-col :span="8">璁″垝鏃堕棿锛�<span style="color: black;">{{ planInfo.palanDate }}</span></el-col>
+ <el-col :span="8">璁″垝鏃堕棿锛�<span style="color: black;">{{ planInfo.planDate }}</span></el-col>
</el-form-item>
<el-form-item>
<el-col :span="8">璁￠噺鍗曚綅锛�<span style="color: black;">{{ planInfo.unit }}</span></el-col>
@@ -148,28 +148,54 @@
:show-text="false"></el-progress>
</el-col>
</el-col>
- <el-col style="width:93%;height: 20vh;margin-top: 30px; margin-left: 40px;">
+ <el-col style="width:93%;height: 20vh;margin-top: 30px; margin-left: 40px;">
<el-table :data="measureData">
- <el-table-column type="inde" label="搴忓彿"/>
- <el-table-column type="inde" label="浠櫒璁惧缂栧彿"/>
- <el-table-column type="inde" label="浠櫒璁惧鍚嶇О"/>
- <el-table-column type="inde" label="娴嬮噺鑼冨洿"/>
- <el-table-column type="inde" label="璁＄畻鍛ㄦ湡"/>
- <el-table-column type="inde" label="璁＄畻缁撴灉"/>
- <el-table-column type="inde" label="璁＄畻鏃ユ湡"/>
- <el-table-column type="inde" label="璁＄畻鏈夋晥鏈�"/>
- <el-table-column type="inde" label="璐熻矗浜�"/>
- <el-table-column type="inde" label="鍒涘缓鏃ユ湡"/>
- <el-table-column type="inde" label="鍒涘缓浜�"/>
- <el-table-column type="inde" label="璁￠噺鍗曚綅"/>
- <el-table-column type="inde" label="璁￠噺缂栧彿"/>
+ <el-table-column type="index" label="搴忓彿" />
+ <el-table-column prop="equipmentCode" label="浠櫒璁惧缂栧彿" />
+ <el-table-column prop="equipmentName" label="浠櫒璁惧鍚嶇О" />
+ <el-table-column prop="measuringRange" label="娴嬮噺鑼冨洿" />
+ <el-table-column prop="termValidity" label="璁＄畻鍛ㄦ湡">
+ <template slot-scope="scope">
+ {{ scope.row.termValidity }}鏈�
+ </template>
+ </el-table-column>
+ <el-table-column prop="result" label="璁＄畻缁撴灉">
+ <template slot-scope="scopeResult">
+ <div v-if="scopeResult.row.result === 1">
+ <span style="color: rgb(78, 210, 16);">姝ｅ父</span>
+ </div>
+ <div v-else-if="scopeResult.row.result === 2">
+ <span style="color: rgb(27, 202, 233);">鐭鍚庡彲鐢�</span>
+ </div>
+ <div v-else-if="scopeResult.row.result == '' || scopeResult.row.result == null">
+ <span style="color: #424744;">鏆傛湭璁￠噺</span>
+ </div>
+ <div v-else>
+ <span style="color: red;">澶卞噯</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column label="璁＄畻鏃ユ湡">
+ <template slot-scope="scopeEndDate">
+ <span v-if="scopeEndDate.row.endDate != '' && scopeEndDate.row.endDate != null">{{
+ scopeEndDate.row.endDate
+ }}</span>
+ <span v-else>鏃�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="validit" label="璁＄畻鏈夋晥鏈�" />
+ <el-table-column prop="measurementName" label="璐熻矗浜�" />
+ <el-table-column prop="imCreateTime" label="鍒涘缓鏃ユ湡" />
+ <el-table-column prop="measurementName" label="鍒涘缓浜�" />
+ <el-table-column prop="measurementUnit" label="璁￠噺鍗曚綅" />
+ <el-table-column prop="equipmentCode" label="璁￠噺缂栧彿" />
</el-table>
</el-col>
- <el-col style="width: 93%;margin-left: 40px; display: flex;justify-content: end;">
+ <el-col style="width: 93%;margin-left: 40px; margin-top: 90px;display: flex;justify-content: end;">
<el-pagination @size-change="handleSizeChangePlan" @current-change="handleCurrentChangePllan"
- :current-page="currentPagePlan" :page-sizes="[5, 10, 20]" :page-size="pageSizePlan"
- layout="total, sizes, prev, pager, next, jumper" :total="totalPlan">
- </el-pagination>
+ :current-page="currentPagePlan" :page-sizes="[5, 10, 20]" :page-size="pageSizePlan"
+ layout="total, sizes, prev, pager, next, jumper" :total="totalPlan">
+ </el-pagination>
</el-col>
</div>
</div>
@@ -177,8 +203,12 @@
</template>
<script>
-import { getPlanPageList, getStandingPageList } from '@/api/laboratory/measure'
+import { getPlanPageList, getStandingPageList, getPlanMeasureInstrument, limitGetPlanMeasureRequest } from '@/api/laboratory/measure'
+import { default as Add } from "./Add.vue";
export default {
+ components: {
+ Add: () => import('./Add.vue')
+ },
data() {
return {
searchData: {
@@ -194,74 +224,8 @@
value: 1,
label: '璁￠噺璁″垝'
}],
- measureLedgerTable: [{
- equipment_code: 'JSTC-W1-00001', // 浠櫒璁惧缂栧彿
- equipment_name: '鏁板瓧鐢垫ˉ', // 浠櫒璁惧鍚嶇О
- measure_range: '---', // 娴嬮噺鑼冨洿
- measurecycle: '12鏈�', // 璁￠噺鍛ㄦ湡
- mesureresult: 1, // 璁￠噺缁撴灉
- date: '2022-07-20', // 璁￠噺鏃ユ湡
- term_validity: '2023-07-20', // 璁￠噺鏈夋晥鏈�
- head: '榛勫皬鏄�' , // 璐熻矗浜�
- create_time: '2023-07-20', // 鍒涘缓鏃ユ湡
- create_person: '榛勫皬鏄�', // 鍒涘缓浜�
- measure_code: 'QCX20230720' // 璁￠噺缂栧彿
- },{
- equipment_code: 'JSTC-W1-00001', // 浠櫒璁惧缂栧彿
- equipment_name: '鏁板瓧鐢垫ˉ', // 浠櫒璁惧鍚嶇О
- measure_range: '---', // 娴嬮噺鑼冨洿
- measurecycle: '12鏈�', // 璁￠噺鍛ㄦ湡
- mesureresult: 0, // 璁￠噺缁撴灉
- date: '2022-07-20', // 璁￠噺鏃ユ湡
- term_validity: '2023-07-20', // 璁￠噺鏈夋晥鏈�
- head: '榛勫皬鏄�' , // 璐熻矗浜�
- create_time: '2023-07-20', // 鍒涘缓鏃ユ湡
- create_person: '榛勫皬鏄�', // 鍒涘缓浜�
- measure_code: 'QCX20230720' // 璁￠噺缂栧彿
- },{
- equipment_code: 'JSTC-W1-00001', // 浠櫒璁惧缂栧彿
- equipment_name: '鏁板瓧鐢垫ˉ', // 浠櫒璁惧鍚嶇О
- measure_range: '---', // 娴嬮噺鑼冨洿
- measurecycle: '12鏈�', // 璁￠噺鍛ㄦ湡
- mesureresult: 1, // 璁￠噺缁撴灉
- date: '2022-07-20', // 璁￠噺鏃ユ湡
- term_validity: '2023-07-20', // 璁￠噺鏈夋晥鏈�
- head: '榛勫皬鏄�' , // 璐熻矗浜�
- create_time: '2023-07-20', // 鍒涘缓鏃ユ湡
- create_person: '榛勫皬鏄�', // 鍒涘缓浜�
- measure_code: 'QCX20230720' // 璁￠噺缂栧彿
- }],
- measurePlanTable: [{
- measure_number: 'QC568946512', // 璁￠噺鍗曞彿
- equipment_code: '010101', // 璁惧缂栧彿
- equipment_name: '鎷夊姏鏈�', // 璁惧鍚嶇О
- scheduled_date: '2023-04-08 ~ 2023-08-08', // 璁″垝鏃ユ湡
- measure_state: 1, // 璁￠噺鐘舵��
- head: '榛勫皬鏄�', // 璁￠噺璐熻矗浜�
- department: '鍦扮嚎妫�娴�', // 璁￠噺鍗曚綅
- creater: '榛勫皬鏄�', // 鍒涘缓浜�
- create_date: '2023-07-20', // 鍒涘缓鏃ユ湡
- },{
- measure_number: 'QC568946512', // 璁￠噺鍗曞彿
- equipment_code: '010101', // 璁惧缂栧彿
- equipment_name: '鎷夊姏鏈�', // 璁惧鍚嶇О
- scheduled_date: '2023-04-08 ~ 2023-08-08', // 璁″垝鏃ユ湡
- measure_state: 1, // 璁￠噺鐘舵��
- head: '榛勫皬鏄�', // 璁￠噺璐熻矗浜�
- department: '鍦扮嚎妫�娴�', // 璁￠噺鍗曚綅
- creater: '榛勫皬鏄�', // 鍒涘缓浜�
- create_date: '2023-07-20', // 鍒涘缓鏃ユ湡
- },{
- measure_number: 'QC568946512', // 璁￠噺鍗曞彿
- equipment_code: '010101', // 璁惧缂栧彿
- equipment_name: '鎷夊姏鏈�', // 璁惧鍚嶇О
- scheduled_date: '2023-04-08 ~ 2023-08-08', // 璁″垝鏃ユ湡
- measure_state: 0, // 璁￠噺鐘舵��
- head: '榛勫皬鏄�', // 璁￠噺璐熻矗浜�
- department: '鍦扮嚎妫�娴�', // 璁￠噺鍗曚綅
- creater: '榛勫皬鏄�', // 鍒涘缓浜�
- create_date: '2023-07-20', // 鍒涘缓鏃ユ湡
- }],
+ measureLedgerTable: [],
+ measurePlanTable: [],
currentPage: 1,
pageSize: 5,
total: 0,
@@ -270,17 +234,18 @@
totalPlan: 0,
drawer: false,
direction: 'rtl',
- lookVisible: false,
+ lookVisible: true,
measureData: [],
planInfo: {
plannedOrderNumber: 7897897987,
measurePerson: '鏌愭煇浜�',
- palanDate: "2021-09-08 ~ 2024-08-09",
+ planDate: "2021-09-08 ~ 2024-08-09",
unit: '鏌愭煇妫�娴嬪眬',
createPerson: '鏌愭煇璐熻矗浜�',
createTime: '2021-09-08'
},
- mymodelTop: -450//14
+ mymodelTop: -600,//14
+ planId: 0
}
},
created() {
@@ -288,23 +253,53 @@
// this.getPlanPageList()
},
methods: {
- handleSizeChangePlan(){
-
+ async handleSizeChangePlan(num) {
+ this.pageSizePlan = num
+ await this.limitGetPlanMeasureInstrument()
},
- handleCurrentChangePllan(){
-
+ async handleCurrentChangePllan(num) {
+ this.currentPagePlan = num
+ await this.limitGetPlanMeasureInstrument()
},
addPlan() {
this.drawer = true
},
+ async limitGetPlanMeasureInstrument() {
+ let res = await limitGetPlanMeasureRequest({
+ id: this.planId,
+ currentPage: this.currentPagePlan,
+ pageSize: this.pageSize
+ })
+ this.totalPlan = res.data.taotal
+ this.measureData = res.data.list
+ },
lookPalan(id) {
+ this.planId = id
+ this.getPlanAndInfoAndIns(id)
this.lookVisible = true
- this.mymodelTop=10
+ this.mymodelTop = 10
this.$parent.triggerMainBtnPlan()
},
- combackLookPlan(){
+ async getPlanAndInfoAndIns(id) {
+ let res = await getPlanMeasureInstrument({ "id": id, "currentPage": this.currentPagePlan, "pageSize": this.pageSize });
+ console.log(res);
+ for (const key in res.data.list) {
+ this.planInfo[key] = res.data.list[key]
+ }
+ this.planInfo.planDate = this.planInfo.beginTime + " ~ " + this.planInfo.endTime
+ this.planInfo.metricalInfoAndInsList.forEach(item => {
+ if (item.endDate != '' && item.endDate != null) {
+ item.validit = this.addMonths(item.endDate, item.termValidity)
+ } else {
+ item.validit = '鏃�'
+ }
+ })
+ this.measureData = this.planInfo.metricalInfoAndInsList
+ this.totalPlan = res.data.total
+ },
+ combackLookPlan() {
this.lookVisible = false
- this.mymodelTop=-450
+ this.mymodelTop = -600
},
blurSearch() {
if (this.radioValue === 1) {
@@ -377,7 +372,7 @@
this.measurePlanTable = res.data.list
this.total = res.data.total
},
- lookMeasurement(code) {
+ async lookMeasurement(code) {
console.log(code);
},
}
--
Gitblit v1.9.3