From cb57bc6b4abf45dbb0605c94359c63e3b31b4b87 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 10 九月 2024 15:55:57 +0800
Subject: [PATCH] 优化报告生成、修改电路下单传参

---
 src/components/do/b1-inspect-order-plan/circuit-parameters2.vue |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
index e986eb7..dab0058 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -180,7 +180,7 @@
 
 <script>
 export default {
-  props:['insProduct','orderId','sampleId','state'],
+  props:['insProduct','orderId','sampleId','state','num'],
   data() {
     return {
       value: "",
@@ -287,7 +287,7 @@
     // 鍒濆鍖栨暟鎹�
     initData(){
       // 澶勭悊椤圭洰
-      this.insProductNew = JSON.parse(JSON.stringify(this.insProduct))
+      this.insProductNew = JSON.parse(JSON.stringify(this.insProduct)).filter(m=>m.inspectionItem.includes('鐢佃矾璇曢獙'))
       this.insProductNew.forEach(async item => {
         // 鑾峰彇璁惧鍒楄〃
         item.equipOptions = await this.getEquipOptions(item)
@@ -343,7 +343,8 @@
                   often:n.often,
                   equipName:n.equipName,
                   equipValue:n.equipValue,
-                  frequency:n.frequency
+                  frequency:n.frequency,
+                  sonLaboratory:item.sonLaboratory
                 }
                 this.$set(obj,'portList', n.port?portList:[])
                 this.$set(obj,'angleList', n.angle?angleList:[])
@@ -431,7 +432,8 @@
           }).then(() => {
             this.$axios.post(this.$api.insOrderPlan.deleteInsContext, {
               frequency:list[index].band,
-              productIds:list[index].projectList.map(m=>m.id)
+              productIds:list[index].projectList.map(m=>m.id),
+              num:this.num
             }, {
             headers: {
               'Content-Type': 'application/json'
@@ -483,7 +485,6 @@
         list.splice(index+1, 0, obj)
       }else if(type=='棰戞'){
         let obj = JSON.parse(JSON.stringify(list[0]));
-        console.log(2222,obj)
         obj.band = ''
         obj.projectList.forEach(item=>{
           item.often = ''

--
Gitblit v1.9.3