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 |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 57 insertions(+), 1 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 936331e..9b56e5b 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -120,6 +120,19 @@
   .collection:active {
     opacity: .7;
   }
+  .table_caret{
+    font-size: 16px;
+    margin: 0 5px;
+    color: rgba(0, 0, 0, 0.1);
+  }
+  .table_caret:hover{
+    color: #409eff;
+    cursor: pointer;
+  }
+
+  .table_caret:active{
+    opacity: .8;
+  }
 </style>
 <style>
   .inspection .el-form-item__label {
@@ -168,6 +181,11 @@
 
   .inspection .el-textarea__inner {
     min-height: 100% !important;
+  }
+
+  .inspection .tables .el-input{
+    display: flex;
+    align-items: center;
   }
 </style>
 <template>
@@ -284,6 +302,16 @@
                       <el-option v-for="(e, i) in enumList" :key="i" :label="e.label" :value="e.value"></el-option>
                     </el-select> -->
                     <span :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
+                  </template>
+                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏍峰搧缂栧彿'">
+                    <div style="display: flex;flex-wrap: nowrap;align-items: center;">
+                      <i class="el-icon-caret-left table_caret" @click="caretSample(-1)"></i>
+                      <div :style="`font-family:${n.v.ff} !important;`">{{currentSample.sampleCode}}</div>
+                      <i class="el-icon-caret-right table_caret" @click="caretSample(1)"></i>
+                    </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.model!==undefined&&currentSample.model!==null">{{currentSample.model}}</div>
                   </template>
                   <span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
                 </div>
@@ -491,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) {
@@ -500,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: [],
@@ -615,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 => {
@@ -1459,6 +1490,31 @@
         nav.addEventListener("mouseleave", function(event) {
           flag = false;
         });
+      },
+      async caretSample(num){
+        let index = this.currentKey + num
+        if(index < 1){
+          this.$message.error('褰撳墠鏄涓�涓牱鍝�')
+          return
+        } else if(index > this.sampleProduct.length){
+          this.$message.error('褰撳墠鏄渶鍚庝竴涓牱鍝�')
+          return
+        }
+        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: [],
+            comValue: [],
+            resValue: null,
+            equipValue: [],
+            equipName: [],
+            insResult: null
+          }
+        })
+        this.getTableLists()
       }
     }
   }

--
Gitblit v1.9.3