更新

src/views/TechnologyCenter/ImportChangeParts/index.vue

@@ -250,18 +250,33 @@ export default {
           const response = await importBasics(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, this.group, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
           const res = response.data
           console.log(res)
+          if (res.hasOwnProperty('output') === false) {
             if (res[0].result === '0') {
               this.$notify.error(`${drawingNum}导入失败`)
             }
-          if (res[0].result === '2') {
+          } else {
-            this.$notify.error(`${drawingNum}导入重复`)
+            if (res.result[0].result === '0') {
+              this.$notify.error(`${drawingNum}导入失败`)
+            }
+            if (res.output[0].导入类型 === '2') {
+              this.$notify.warning(`存在重复数据`)
+            }
           }
         } else {
           const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, this.group, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
           const res = response.data
+          if (res.hasOwnProperty('output') === false) {
             if (res[0].result === '0') {
               this.$notify.error(`${drawingNum}导入失败`)
             }
+          } else {
+            if (res.result[0].result === '0') {
+              this.$notify.error(`${drawingNum}导入失败`)
+            }
+            if (res.output[0].导入类型 === '2') {
+              this.$notify.warning(`存在重复数据`)
+            }
+          }
         }
       } catch (e) {
         this.err++

src/views/TechnologyCenter/ImportParts/index.vue

@@ -414,17 +414,28 @@ export default {
           const response = await importBasics(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, this.group, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
           const res = response.data
           console.log(res, 11111111)
+          if (res.hasOwnProperty('output') === false) {
+            if (res[0].result === '0') {
+              this.$notify.error(`${drawingNum}导入失败`)
+            }
+          } else {
             if (res.result[0].result === '0') {
               this.$notify.error(`${drawingNum}导入失败`)
             }
             if (res.output[0].导入类型 === '2') {
               this.$notify.warning(`存在重复数据`)
             }
+          }
         } else {
           console.log(drawingNum, 1111111111)
           const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, this.group, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
           const res = response.data
           console.log(res, 222222)
+          if (res.hasOwnProperty('output') === false) {
+            if (res[0].result === '0') {
+              this.$notify.error(`${drawingNum}导入失败`)
+            }
+          } else {
             if (res.result[0].result === '0') {
               this.$notify.error(`${drawingNum}导入失败`)
             }
@@ -432,6 +443,7 @@ export default {
               this.$notify.warning(`存在重复数据`)
             }
           }
+        }
       } catch (e) {
         console.log('哈哈哈哈')
         this.err++