数据

src/pages/modules/takeshape/one.vue

@@ -863,27 +863,45 @@ export default {
     async _workshopCondition () {
       let res = await workshopCondition()
       if (res.code === 200) {
-        this.PressMachineList = [...res.result.PressMachineList]
-        this.TrappedShelfList = [...res.result.TrappedShelfList]
-        this.StackingPositionList = [...res.result.StackingPositionList]
-        this.TrappedMaterialShelfList = [...res.result.TrappedMaterialShelfList]
-        this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
+        if (res.result.hasOwnProperty('PressMachineList')) {
+          this.PressMachineList = [...res.result.PressMachineList]
+        }
+        if (res.result.hasOwnProperty('TrappedShelfList')) {
+          this.TrappedShelfList = [...res.result.TrappedShelfList]
+        }
+        if (res.result.hasOwnProperty('StackingPositionList')) {
+          this.StackingPositionList = [...res.result.StackingPositionList]
+        }
+        if (res.result.hasOwnProperty('TrappedMaterialShelfList')) {
+          this.TrappedMaterialShelfList = [...res.result.TrappedMaterialShelfList]
+        }
+        if (res.result.hasOwnProperty('ManipulatorInfoList')) {
+          this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
+        }
       }
     },
     // 弹窗内容
     async _moldingMaterialCondition () {
       let res = await moldingMaterialCondition()
       if (res.code === 200) {
-        this.PressPopoverList = [...res.result.PressPopoverList]
-        this.ManipulatorList = [...res.result.ManipulatorList]
-        this.TrayStationPopoverList = [...res.result.TrayStationPopoverList]
+        if (res.result.hasOwnProperty('PressPopoverList')) {
+          this.PressPopoverList = [...res.result.PressPopoverList]
+        }
+        if (res.result.hasOwnProperty('ManipulatorList')) {
+          this.ManipulatorList = [...res.result.ManipulatorList]
+        }
+        if (res.result.hasOwnProperty('TrayStationPopoverList')) {
+          this.TrayStationPopoverList = [...res.result.TrayStationPopoverList]
+        }
       }
     },
     // 困料货架弹窗
     async _trappedMaterialCondition () {
       let res = await trappedMaterialCondition()
       if (res.code === 200) {
-        this.TrappedShelf40List = [...res.result.TrappedShelf40List]
+        if (res.result.hasOwnProperty('TrappedShelf40List')) {
+          this.TrappedShelf40List = [...res.result.TrappedShelf40List]
+        }
       }
     },
     expandTooltip () {