合并分支 'hotfix' 到 'master'

Hotfix

查看合并请求 !7

src/views/base/houseBaseInfo/index.vue

@@ -514,6 +514,10 @@ export default {
       this.initOrderInfo()
     },
     showDetail(row) {
+      console.log('555:'+row.applyId);
+      //第三发导入数据applyId为空提示第三方生成
+      if(row.applyId !==null){
+       
       const _this = this.$refs[row.orderType]
       var params = {id: row.applyId}
       if (row.orderType == '库存调拨') { params.type = '调拨' }
@@ -528,6 +532,10 @@ export default {
         }
       })      
       _this.dialog = true
+      
+      }else{
+        this.$message.warning('该数据为第三方生成');
+      }
     }
   }
 }