From e841b95caeeb3ba3f512fab431976f64f1061a9e Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期五, 09 八月 2024 17:58:19 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 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 c454335..713522c 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -242,7 +242,7 @@
         <!-- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">鍏夌氦鍒囨崲</el-button>
         <el-button size="small" type="primary" @click="fiberOpticTapeVisible=true" v-if="fiberOpticTape.length>0">鍏夌氦甯﹀垏鎹�</el-button>
         <el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">濂楃鍒囨崲</el-button> -->
-        <el-button size="small" type="primary" @click="sampleVisible=true">鏍峰搧鍒囨崲</el-button>
+        <el-button size="small" type="primary" @click="sampleVisible=true;uploadSample()">鏍峰搧鍒囨崲</el-button>
         <el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
         <el-button size="small" type="primary" @click="addVerifyDia = true" v-if="state==1"
           :loading="submitLoading">鎻愪氦</el-button>
@@ -1057,6 +1057,7 @@
         getDataIndex:[],
         getDataIndexLoading:false,
         changeType:null,
+        getDataTypeId:''
       }
     },
     computed: {
@@ -1397,6 +1398,7 @@
             // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
             this.getDataIndexLoading = false
             this.dataGetDia = false
+            this.getDataTypeId = ''
             this.worker0.postMessage(JSON.stringify({
               dataAcquisitionInfo: this.dataAcquisitionInfo,
               list:this.tableList[0].arr
@@ -1412,6 +1414,8 @@
             let {list,n} = result.value
             this.$set(this.tableList[0],'arr',list)
             this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
+          }else if(result.getDataTypeId){
+            this.getDataTypeId = result.getDataTypeId
           }
         };
       },
@@ -1984,6 +1988,14 @@
         this.fileAdd = fileAdd
         this.collected = collected
         this.temDataAcquisition = temDataAcquisition
+      },
+      uploadSample(){
+        this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
+          id: this.id,
+          laboratory: this.sonLaboratory
+        }).then(async res => {
+          this.sampleProduct = res.data.sampleProduct
+        })
       },
       async getCurrentProduct(id,type){
         this.tableLoading = true;
@@ -2672,7 +2684,7 @@
         let str = code.split('-')
         let pId = str[3]
         for(let i =0;i<this.currentSample.insProduct.length;i++){
-          if(this.currentSample.insProduct[i].id==pId&&(this.currentSample.insProduct[i].ask=='-'||this.currentSample.insProduct[i].ask=='/')){
+          if(this.currentSample.insProduct[i].id==pId&&(this.currentSample.insProduct[i].ask=='-'||this.currentSample.insProduct[i].ask=='/'||this.currentSample.insProduct[i].ask=='鈥�')){
             this.tableList[0].arr.forEach(item=>{
               item.forEach(m=>{
                 if(m.i==pId&&m.v.ps&&m.v.ps.value=='缁撹'){
@@ -2714,15 +2726,20 @@
             currentSample:this.currentSample,
             PROJECT:this.PROJECT,
             param:this.param,
-            currentTable:this.currentTable
+            currentTable:this.currentTable,
+            getDataTypeId:this.getDataTypeId
           }));
         } catch (error) {
           console.log(444,error);
         }
+        let getDataType = false
 
         // 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
         this.worker.onmessage = (event) => {
           this.result = JSON.parse(event.data);
+          if(this.result.value.getDataTypeId){
+            getDataType = true
+          }
           switch (this.result.method){
             case 'saveInsContext':
               this.$nextTick(()=>{
@@ -2738,7 +2755,13 @@
                     }
                   }
                 }
-                this.saveInsContext()
+                if(this.isGet&&!this.dataAcquisitionEidtAble&&!getDataType){
+                  return
+                }
+                setTimeout(()=>{
+                  this.saveInsContext()
+                },2000)
+                // this.saveInsContext()
               })
               break;
             case 'tableList':
@@ -3132,8 +3155,8 @@
         return
       },
       saveInsContext() {
-        console.log(1111,this.param)
         try {
+          console.log(1111,this.param)
           if(this.param){
             this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
               param: JSON.stringify(this.param)

--
Gitblit v1.9.3