Merge branch 'dev-market-20200813' of...

Merge branch 'dev-market-20200813' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-market-20200813

src/views/goods/create-good.vue

@@ -790,9 +790,11 @@
           }
           this.formData.stock -= this.stock.num
           this.formData.decrStock = this.formData.stock
+          this.formData.incrStock = ''
         }else if(this.stock.type == 2){
           this.formData.stock = Number(this.stock.num) + Number(this.formData.stock)
           this.formData.incrStock = this.formData.stock
+          this.formData.decrStock = ''
         }
          this.formData.goodsStock = this.formData.stock
         this.stockDio = false
@@ -852,7 +854,11 @@
         this.formData.hasChanged = true;
         updateGoods(this.formData).then((res)=>{
           if (res.code !== '000000') {
-            return this.$message.error(res.message);
+           // return this.$message.error(res.message);
+              return this.$message({
+                message: res.message,
+                type: 'error'
+              });
           }
           vm.$message.success("操作成功");
         })