From d083b10403968b394a0a2076a3cab72efa5810ea Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 02 九月 2024 17:17:21 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index e6886ed..77318b8 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -258,12 +258,13 @@
         <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;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"
+        <el-button size="small" type="primary" @click="handleSubmit" v-if="state==1"
           :loading="submitLoading">鎻愪氦</el-button>
         <!-- 澶嶆牳 -->
-        <el-button size="medium" type="primary" @click="upInsReview(1)" :loading="reviewLoading"
-          v-if="state>1">閫氳繃</el-button>
-        <el-button size="medium" @click="upInsReview(0)" v-if="state>1">涓嶉�氳繃</el-button>
+        <el-button size="small" type="primary" @click="upInsReview(1)" :loading="reviewLoading"
+          v-if="state>1">缁х画璇曢獙</el-button>
+        <el-button size="small" @click="upInsReview(0)" v-if="state>1" type="danger">鍐嶆璇曢獙</el-button>
+        <el-button size="small" @click="upInsReview(2)" v-if="state>1">缁撴潫璇曢獙</el-button>
         <el-button size="small" @click="$emit('goback')">杩斿洖</el-button>
       </el-col>
     </el-row>
@@ -438,6 +439,9 @@
                   </template>
                   <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏍峰搧鍨嬪彿'">
                     <div :style="`font-family:${n.v.ff} !important;`" v-if="currentSample.model!==undefined&&currentSample.model!==null">{{currentSample.model}}</div>
+                  </template>
+                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='璇曢獙鏍囧噯'">
+                    <div :style="`font-family:${n.v.ff} !important;`" v-if="currentSample.testRequirements!==undefined&&currentSample.testRequirements!==null">{{currentSample.testRequirements}}</div>
                   </template>
                   <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='濂楃'">
                     <div style="display: flex;flex-wrap: nowrap;align-items: center;">
@@ -1460,7 +1464,7 @@
             }else{
               str0 = i+','+j
             }
-            if(j!='frequency'&&data[i][j]&&typeof data[i][j].result == 'string'){
+            if(j!='frequency'&&data[i][j]&&(!data[i][j].result||typeof data[i][j].result == 'string')){
               // 澶勭悊鏁伴噰淇℃伅鏍煎紡
               this.dataAcquisitionInfo[str0] = {
                 value:data[i][j].result,
@@ -2738,6 +2742,7 @@
               }
             }
           })
+          console.log(4444,a.template)
           // 鎿嶄綔璧嬪��--涓昏璧嬪�煎崟浣�,璇曢獙鏂规硶绛変俊鎭�
           ids.forEach(id => {
             for (let b = 0; b < a.template.length; b++) {
@@ -2750,6 +2755,9 @@
                     .ps.value === '妫�娴嬫柟娉�')) {
                   a.template[b].v.v = id.product.methodS
                 }
+                // if (a.template[b].v.ps != undefined && (a.template[b].v.ps.value === '璇曢獙鏍囧噯')) {
+                //   a.template[b].v.v = id.product.testRequirements
+                // }
               }
             }
           })
@@ -3291,12 +3299,12 @@
       },
       // 澶嶆牳
       upInsReview(e) {
-        if (e == 1) {
-          // 閫氳繃
+        if (e == 1||e==2) {
+          // 缁х画璇曢獙
           this.reviewLoading = true;
           this.$axios.post(this.$api.insOrderPlan.verifyPlan, {
             orderId: this.orderId,
-            type: 1,
+            type: e,
             laboratory: this.sonLaboratory,
             tell: null
           }).then(res => {
@@ -3309,8 +3317,8 @@
             console.error(error)
             this.reviewLoading = false;
           })
-        } else {
-          // 涓嶉�氳繃
+        } else{
+          // 鍐嶆璇曢獙
           this.reviewDia = true;
         }
       },
@@ -3334,6 +3342,14 @@
           })
         } else {
           this.$message.error('鏈緭鍏ヤ笉閫氳繃鍘熷洜')
+        }
+      },
+      handleSubmit(){
+        if(this.insOrder.orderType=='C'){
+          this.verifyUser = this.insOrder.prepareUserId
+          this.submit()
+        }else{
+          this.addVerifyDia = true
         }
       },
       submit() {
@@ -3394,8 +3410,9 @@
                   orderId: this.orderId,
                   laboratory: this.sonLaboratory,
                   verifyUser: this.verifyUser
-                }).then(res => {
+                }).then( res => {
                   if (res.code === 200) {
+                    this.submitLoading = false;
                     this.$message.success("鎿嶄綔鎴愬姛")
                     this.$emit('goback')
                   }
@@ -3406,13 +3423,26 @@
             }
 
           }
-          this.submitLoading = false;
         }).catch(error => {
           console.error(error)
           this.submitLoading = false;
         })
         return
       },
+      async handleCType(){
+        if(this.insOrder.departmentLims=='璐ㄩ噺閮�'){
+          await this.$axios.post(this.$api.insOrderPlan.verifyPlan, {
+            orderId: this.orderId,
+            type: 1,
+            laboratory: this.sonLaboratory,
+            tell: null
+          }).then(res => {
+            if (res.code === 200) {
+            }
+          }).catch(error => {
+          })
+        }
+      },
       // 缁熶竴鍦ㄨ繖閲屼繚瀛樻暟鎹�
       saveInsContext() {
         try {

--
Gitblit v1.9.3