From 808b9c25bedd4205651d8ac821838f9b2e7a5044 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 04 六月 2024 20:37:58 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 4592b60..9b56e5b 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -519,7 +519,7 @@
this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
id: val,
laboratory: this.sonLaboratory
- }).then(res => {
+ }).then(async res => {
this.insOrder = res.data.insOrder;
this.urgentList.forEach(m => {
if (m.value == this.insOrder.type) {
@@ -528,6 +528,8 @@
})
this.sampleProduct = res.data.sampleProduct
this.currentSample = this.HaveJson(this.sampleProduct[0])
+ let list = await this.getCurrentProduct(this.currentSample.id,0)
+ this.currentSample.insProduct = this.HaveJson(list)
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -643,6 +645,7 @@
this.bushing = []
this.currentBushing = null;
this.sampleVisible = false;
+ this.currentSample = this.HaveJson(row)
let list = await this.getCurrentProduct(row.id,0)
this.currentSample.insProduct = this.HaveJson(list)
this.currentSample.insProduct.forEach(a => {
@@ -1488,7 +1491,7 @@
flag = false;
});
},
- caretSample(num){
+ async caretSample(num){
let index = this.currentKey + num
if(index < 1){
this.$message.error('褰撳墠鏄涓�涓牱鍝�')
@@ -1499,6 +1502,8 @@
}
this.currentKey = index
this.currentSample = this.HaveJson(this.sampleProduct[index - 1])
+ let list = await this.getCurrentProduct(this.currentSample.id,0)
+ this.currentSample.insProduct = this.HaveJson(list)
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
--
Gitblit v1.9.3