Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/components/SapPropertyData/index.vue

@@ -72,6 +72,9 @@ export default {
       console.log(this.sapData)
       if (this.loading) return
       if (!this.form.type || !this.form.relationId) return this.$message.error("对象为创建")
+      let baseInfo = this.sapData.baseInfo
+      delete this.sapData.baseInfo
+      this.sapData = {...baseInfo, ...this.sapData}
       this.$refs.form.validate(valid => {
         if (valid) {
           this.loading = true