Merge commit 'fb4444fc6f9ac823e12058095139cc14745de99e' into moss_dev

* commit 'fb4444fc6f9ac823e12058095139cc14745de99e':
  feat：添加商品页面加一个去商品物料页面的入口

# Conflicts:
#	src/views/mallManagement/goods/goods_add/index.vue

src/views/mallManagement/goods/goods_add/index.vue

@@ -176,7 +176,10 @@
 
       <el-form ref="step2Form" :model="step2Form" :rules="step2FormRules" label-width="110px">
         <el-form-item label="规格类型：" label-width="90px">
-          <div class="addBtn"><el-button type="primary" size="small" @click="addSpec">添加规格</el-button></div>
+          <div class="addBtn">
+            <el-button type="primary" size="small" @click="addSpec">添加规格</el-button>
+            <el-button size="small" @click="toMaterial">去商品物料</el-button>
+          </div>
         </el-form-item>
 
         <el-form-item label-width="0">
@@ -286,14 +289,14 @@
                 <el-input size="small" v-model="scope.row.innerShareAmount"></el-input>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="*商品库存" prop="stockNum" min-width="120">
+            <el-table-column align="center" label="*上架库存" prop="stockNum" min-width="120">
               <template slot-scope="scope">
                 <el-input size="small" v-model="scope.row.stockNum"></el-input>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="仓库库存" prop="stockQty" min-width="120">
+            <el-table-column align="center" label="当前库存" prop="stockQty" min-width="120">
               <template slot-scope="scope">
-                {{scope.row.stockQty || 0}}
+                {{scope.row.stockQty}}
               </template>
             </el-table-column>
             <el-table-column align="center" label="*规格图片" prop="imgUrl" min-width="120">
@@ -1189,6 +1192,13 @@ export default {
       this.specList[this.editSpecImageIdx].imgUrl = res.data.url;
     },
 
+    toMaterial() {
+      this.$router.push({
+        name: "commercialMaterial",
+        query: {}
+      })
+    }
+
   }
 
 }