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 |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 4e6cafe..2060de5 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -209,9 +209,6 @@
   <div v-loading="loading" class="inspection">
     <el-row class="title">
       <el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屽崟璇︽儏
-        <!-- <span style="color: #3A7BFA;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;鏍峰搧</span>
-        <span v-if="currentFiberOpticTape" style="color: #3A7BFA;"> - 鍏夌氦甯�</span>
-        <span v-if="currentFiberOptic" style="color: #3A7BFA;"> - 鍏夌氦</span> -->
       </el-col>
       <el-col :span="12" style="text-align: right;">
         <!-- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">鍏夌氦鍒囨崲</el-button>
@@ -1008,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
@@ -2178,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("鎿嶄綔鎴愬姛")
@@ -2231,6 +2231,7 @@
         return
       },
       saveInsContext() {
+        console.log(1111,this.param)
         if(this.param){
           this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
             param: JSON.stringify(this.param)
@@ -2255,6 +2256,16 @@
             }
           }
         }
+        this.dataAcquisitionEidt = 0
+        if(this.param){
+          for (let key in this.param) {
+            this.param[key].equipValue.forEach(m=>{
+              if(m.isItADataAcquisitionDevice){
+                this.dataAcquisitionEidt++
+              }
+            })
+          }
+        }
         this.saveInsContext()
       },
       getAuthorizedPerson() {

--
Gitblit v1.9.3