From a8800754977616153202aae4d32deb7bb42f0612 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 31 七月 2024 15:16:13 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

---
 src/components/do/b1-ins-order/add.vue |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 650f2f4..0156774 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -2063,6 +2063,9 @@
       upProductSelect(selection, row) {
         this.bsm1DiaList = []
         row.state = row.state == 1 ? 0 : 1
+        if(row.section === null) {
+          row.section = ""
+        }
         let arr = this.productList.filter(m=>m.state==1&&row.section.includes(m.section)&&m.ask&&m.section.indexOf('[')==-1)
         if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1&&arr.length==0) {
           if (row.section.indexOf('[') > -1) {
@@ -2074,6 +2077,7 @@
         } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0&&arr.length==0) {
           row.bsm1 = false
         }else if(arr.length>0){
+          try{
           row.bsmRow = this.HaveJson(row)
           let section = arr[0].section
           let arr0 = JSON.parse(row.section)
@@ -2087,6 +2091,7 @@
           row.manHour = arr2[index]
           row.price = arr3[index]
           row.tell = arr4[index]
+          } catch(e) {}
         }
         if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1&&!this.isBsm2Val2) {
           this.bsm2 = true

--
Gitblit v1.9.3