合并产品代码至节点[6846] (d48b2e6c)

applications/architecture-dee/src/businessCompontents/fileUploadMangement.vue

@@ -143,8 +143,8 @@ export default {
                 placement: 'bottom',
                 width: '400',
                 title: '失败原因'
-              },
-              style: 'height:100px;overflow:scroll'
+              }
+              // style: 'height:100px;overflow:scroll'
             }, [
               h(
                 'p', {

applications/dee-pdc/src/views/sandbox/bomReconsitution/bomReconsitutionDetail.vue

@@ -170,11 +170,9 @@ import partEdit from './partEdit.vue'
 import { dxSandboxPublish, dxSandboxCancel, checkSandboxObjectIsCheckouted, checkItemIsInAnySandbox, checkEquivalenceLink, checkPartIsPreviousView } from '@/api/parts'
 import { getSubTypeName } from '@/api/model'
 export default {
-// import引入的组件需要注入到对象中才能使用
+  name: 'BomReconsitutionDetail',
+  // import引入的组件需要注入到对象中才能使用
   components: { Search, SearchResult, sandboxTree, partEdit },
-
-  props: {},
-
   data() {
     // 这里存放数据
     return {
@@ -569,6 +567,7 @@ export default {
     async getSandboxObj() {
       await this.service.byId(this.sandboxId).then(item => {
         this.sandboxObj = item
+        this.noSandboxDataTip()
       })
     },
     async checkSandboxObjectIsCheckouted() {
@@ -651,6 +650,9 @@ export default {
       this.$refs.result.refreshStructure()
     },
     changeViews(flag, convertType = '', dialogVisible = true) {
+      if (this.noSandboxDataTip()) {
+        return
+      }
       if (!this.node) {
         this.$utils.showMessage('请选择原视图件！')
       } else {
@@ -789,6 +791,14 @@ export default {
         this.hasTreeData = false
         this.$set(this.form, 'isConvertRoot', 'true')
       }
+    },
+    // 没有沙箱提示
+    noSandboxDataTip() {
+      if (!this.sandboxObj) {
+        this.$utils.showMessage('沙箱数据不存在', 'warning')
+        return true
+      }
+      return false
     }
   }
 }