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

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index cbbee28..77318b8 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -440,6 +440,9 @@
                   <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;">
                       <!-- <i class="el-icon-caret-left table_caret" @click="caretBushing(-1)"></i> -->
@@ -2739,6 +2742,7 @@
               }
             }
           })
+          console.log(4444,a.template)
           // 鎿嶄綔璧嬪��--涓昏璧嬪�煎崟浣�,璇曢獙鏂规硶绛変俊鎭�
           ids.forEach(id => {
             for (let b = 0; b < a.template.length; b++) {
@@ -2751,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
+                // }
               }
             }
           })

--
Gitblit v1.9.3