From adeed9c2997994193ceb4d9667e7ef1bfe07de48 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 22 七月 2024 10:57:28 +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 | 7 +++++--
1 files changed, 5 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 a339685..2060de5 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1005,8 +1005,9 @@
},
methods: {
getDataAcquisitionDevice(){
+
this.dataAcquisitionLoading = true
- this.$axios.get(this.$api.deviceScope.dataCollection+'?entrustCode='+this.insOrder.entrustCode+'&sampleCode='+this.currentSample.sampleCode).then(res=>{
+ this.$axios.get(this.$api.deviceScope.dataCollection+'?entrustCode='+this.insOrder.entrustCode+'&sampleCode='+this.currentSample.sampleCode + '&id=' + this.currentSample.id).then(res=>{
this.dataAcquisitionLoading = false
if(res.code!=200){
return
@@ -2175,7 +2176,9 @@
this.$axios.post(this.$api.insOrderPlan.submitPlan, {
orderId: this.orderId,
laboratory: this.sonLaboratory,
- verifyUser: this.verifyUser
+ verifyUser: this.verifyUser,
+ entrustCode: this.insOrder.entrustCode,
+ sampleCode: this.currentSample.sampleCode
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
--
Gitblit v1.9.3