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

@@ -379,7 +379,7 @@
                 <el-col :span="20">
                   <div class="stock-com">
                     <span class="sp sp-l" @click="changeStock(1)" :class="{'opac':formData.stock == 0}"><i class="el-icon-minus"></i></span>
-                    <span class="sp sp-c">{{formData.goodsStock}}</span>
+                    <span class="sp sp-c">{{formData.stock}}</span>
                     <span class="sp sp-r" @click="changeStock(2)"><i class="el-icon-plus"></i></span>
                   </div>
                  <p class="error-message" v-if="!isgoodStock">库存不能为0</p>
@@ -690,7 +690,17 @@
           this.isMedic = this.formData.goodsType == 5 ? true : false
           this.formData.stock = this.formData.goodsStock
           if(this.isMedic){
-            this.getLever(5,2)
+            this.getLever(5,2,1)
+          }
+          const {categoryIdLevel2,categoryIdLevel3,categoryIdLevel4,categoryIdLevel5} = this.formData
+          if(categoryIdLevel2 != -1){
+             this.getLever(categoryIdLevel2,3,1)
+          }
+          if(categoryIdLevel3 != -1){
+             this.getLever(categoryIdLevel3,4,1)
+          }
+          if(categoryIdLevel4 != -1){
+             this.getLever(categoryIdLevel4,5,1)
           }
 
           console.log(this.formData)
@@ -753,7 +763,7 @@
       },
 
       //获取分类
-      getLever(id,type){
+      getLever(id,type,parm){
 
         this.GET("store/category/"+id).then(res => {
             console.log(res)
@@ -766,13 +776,19 @@
               this.twoLever = res.data || this.defaultArr()
             }else if(type == 3){
               this.threeLever = res.data.length > 0 ? res.data : this.defaultArr()
-              this.formData.categoryIdLevel3 = ''
-              this.formData.categoryIdLevel4 = ''
-              this.formData.categoryIdLevel5 = ''
+              if(!parm){
+                this.formData.categoryIdLevel3 = ''
+                this.formData.categoryIdLevel4 = ''
+                this.formData.categoryIdLevel5 = ''
+              }
+
             }else if(type == 4){
+
               this.fourLever = res.data.length > 0 ? res.data : this.defaultArr()
-              this.formData.categoryIdLevel4 = ''
-              this.formData.categoryIdLevel5 = ''
+              if(!parm){
+                this.formData.categoryIdLevel4 = ''
+                this.formData.categoryIdLevel5 = ''
+              }
             }else if(type == 5){
               this.fiveLever = res.data.length > 0 ? res.data : this.defaultArr()
             }
@@ -796,21 +812,21 @@
         }
 
         if(this.stock.type == 1){
-          if(this.stock.num > this.formData.stock){
+          if(this.stock.num > this.formData.goodsStock){
             return  this.$message({
               message: '减少库存数量不得大于当前库存',
               type: 'warning'
             });
           }
           this.formData.stock -= this.stock.num
-          this.formData.decrStock = this.formData.stock
+          this.formData.decrStock = Number(this.stock.num)
           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.incrStock = Number(this.stock.num)
           this.formData.decrStock = ''
         }
-         this.formData.goodsStock = this.formData.stock
+        //this.formData.goodsStock = this.formData.stock
         this.stockDio = false
       },