From 15c3426bb3b311cc20860daee120037de3834dbc Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 10 Jun 2025 15:52:40 +0800
Subject: [PATCH] 2025-06-10

---
 src/api/part/bomManagement.js                 |  7 ++
 .../com_technical-add-or-update.vue           | 16 +++--
 .../com_tsd_basicInformation.vue              | 64 ++++++++++++++-----
 3 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/src/api/part/bomManagement.js b/src/api/part/bomManagement.js
index 40df69d..7a59b4d 100644
--- a/src/api/part/bomManagement.js
+++ b/src/api/part/bomManagement.js
@@ -203,4 +203,11 @@ export const queryPartListBom = data => createAPI(`/plm/bomManagement/queryPartL
  */
 export const queryPartListAll = data => createAPI(`/plm/bomManagement/queryPartListAll`,'post',data)
 
+/**
+ * 查子物料BOM
+ */
+export const queryComponentPartBomList = data => createAPI(`/plm/bomManagement/queryComponentPartBomList`,'post',data)
+
+
+
 
diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
index 77a931c..df40ae2 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -1107,13 +1107,21 @@
           return false
         }
         this.dataForm.engineerList = []
-        this.dataForm.engineerList.push(this.dataForm.engineerNo) // Engineer
+        if (this.dataForm.engineerNo !== '') {
+          this.dataForm.engineerList.push(this.dataForm.engineerNo) // Engineer
+        }
         this.dataForm.technicianList = []
-        this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
+        if (this.dataForm.technicianNo !== '') {
+          this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
+        }
         this.dataForm.csOperatorList = []
-        this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
+        if (this.dataForm.csOperater !== '') {
+          this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
+        }
         this.dataForm.planOperatorList = []
-        this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
+        if (this.dataForm.planOperator !== '') {
+          this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
+        }
         this.saveLoading = true
         saveTechnicalSpecificationSheet(this.dataForm).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index 8d57277..ad9ab36 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -948,13 +948,21 @@
 
       saveData () {
         this.dataForm.engineerList = []
-        this.dataForm.engineerList.push(this.dataForm.engineerNo) // Engineer
+        if (this.dataForm.engineerNo !== '') {
+          this.dataForm.engineerList.push(this.dataForm.engineerNo) // Engineer
+        }
         this.dataForm.technicianList = []
-        this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
+        if (this.dataForm.technicianNo !== '') {
+          this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
+        }
         this.dataForm.csOperatorList = []
-        this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
+        if (this.dataForm.csOperater !== '') {
+          this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
+        }
         this.dataForm.planOperatorList = []
-        this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
+        if (this.dataForm.planOperator !== '') {
+          this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
+        }
         this.$confirm("是否保存基本信息？", '保存提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1055,13 +1063,21 @@
           type: 'warning'
         }).then(() => {
           this.dataForm.engineerList = []
-          this.dataForm.engineerList.push(this.dataForm.engineerNo) // Engineer
+          if (this.dataForm.engineerNo !== '') {
+            this.dataForm.engineerList.push(this.dataForm.engineerNo) // Engineer
+          }
           this.dataForm.technicianList = []
-          this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
+          if (this.dataForm.technicianNo !== '') {
+            this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
+          }
           this.dataForm.csOperatorList = []
-          this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
+          if (this.dataForm.csOperater !== '') {
+            this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
+          }
           this.dataForm.planOperatorList = []
-          this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
+          if (this.dataForm.planOperator !== '') {
+            this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
+          }
           let tempData = {
             ...this.dataForm,
             site: this.searchData.site,
@@ -1082,13 +1098,21 @@
           type: 'warning'
         }).then(() => {
           this.dataForm.engineerList = []
-          this.dataForm.engineerList.push(this.dataForm.engineerNo) // Engineer
+          if (this.dataForm.engineerNo !== '') {
+            this.dataForm.engineerList.push(this.dataForm.engineerNo) // Engineer
+          }
           this.dataForm.technicianList = []
-          this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
+          if (this.dataForm.technicianNo !== '') {
+            this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
+          }
           this.dataForm.csOperatorList = []
-          this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
+          if (this.dataForm.csOperater !== '') {
+            this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
+          }
           this.dataForm.planOperatorList = []
-          this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
+          if (this.dataForm.planOperator !== '') {
+            this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
+          }
           let tempData = {
             ...this.dataForm,
             site: this.searchData.site,
@@ -1130,13 +1154,21 @@
           type: 'warning'
         }).then(() => {
           this.dataForm.engineerList = []
-          this.dataForm.engineerList.push(this.dataForm.engineerNo) // Engineer
+          if (this.dataForm.engineerNo !== '') {
+            this.dataForm.engineerList.push(this.dataForm.engineerNo) // Engineer
+          }
           this.dataForm.technicianList = []
-          this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
+          if (this.dataForm.technicianNo !== '') {
+            this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
+          }
           this.dataForm.csOperatorList = []
-          this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
+          if (this.dataForm.csOperater !== '') {
+            this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
+          }
           this.dataForm.planOperatorList = []
-          this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
+          if (this.dataForm.planOperator !== '') {
+            this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
+          }
           let tempData = {
             ...this.dataForm,
             site: this.searchData.site,