From 0f32593939c05e2a2d699b27083c5dab77ef9870 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 18 八月 2023 08:56:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/laboratory/measure/index.vue | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 96ab797..a9bd91e 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -194,8 +194,74 @@
value: 1,
label: '璁￠噺璁″垝'
}],
- measureLedgerTable: [],
- measurePlanTable: [],
+ 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', // 鍒涘缓鏃ユ湡
+ }],
currentPage: 1,
pageSize: 5,
total: 0,
@@ -219,6 +285,7 @@
},
created() {
this.getStandingPageList()
+ // this.getPlanPageList()
},
methods: {
handleSizeChangePlan(){
--
Gitblit v1.9.3