From 07959b422026f1de7bbd90af23e440ebd4fea567 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 03 九月 2024 10:50:46 +0800
Subject: [PATCH] 菜单

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 4dcd1af..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
+                // }
               }
             }
           })
@@ -3310,7 +3317,7 @@
             console.error(error)
             this.reviewLoading = false;
           })
-        } else if (e == 1) {
+        } else{
           // 鍐嶆璇曢獙
           this.reviewDia = true;
         }
@@ -3405,6 +3412,7 @@
                   verifyUser: this.verifyUser
                 }).then( res => {
                   if (res.code === 200) {
+                    this.submitLoading = false;
                     this.$message.success("鎿嶄綔鎴愬姛")
                     this.$emit('goback')
                   }
@@ -3415,7 +3423,6 @@
             }
 
           }
-          this.submitLoading = false;
         }).catch(error => {
           console.error(error)
           this.submitLoading = false;

--
Gitblit v1.9.3