Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/goodsManager/goodManager/edit.vue

@@ -123,7 +123,7 @@ export default {
     }),
     Case: {
       get () {
-        return this.detail.CaseId || this.caseid
+        return this.detail.CaseId
       },
       set (val) {
         this.UpdateInfo({ ...this.detail, CaseId: val })
@@ -172,13 +172,6 @@ export default {
           return x.ImgUrl
         }
       }).join(',')
-      if ((this.detail.CaseId || '') === '') {
-        this.$message({
-          type: 'error',
-          message: '案场不能为空'
-        })
-        return false
-      }
       if ((this.detail.GoodsName || '') === '') {
         this.$message({
           type: 'error',
@@ -212,8 +205,22 @@ export default {
         if (!this.detail.CaseId || this.detail.CaseId === '') {
           this.detail.CaseId = this.caseid
         }
+        if ((this.detail.CaseId || '') === '') {
+          this.$message({
+            type: 'error',
+            message: '案场不能为空'
+          })
+          return false
+        }
         this.AddGoods(this.detail)
       } else {
+        if ((this.detail.CaseId || '') === '') {
+          this.$message({
+            type: 'error',
+            message: '案场不能为空'
+          })
+          return false
+        }
         this.UpdateGoods(this.detail)
       }
       this.$message({