Merge branch 'v2' of http://140.143.224.240:8100/hooloo/web/soss into v2

src/views/goods/goods/components/Specification.vue

 <template>
   <div>
-    <el-dialog title="商品规格机器操作步骤详情" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog title="规格详情" :visible.sync="open" width="1000px" append-to-body>
 
         <el-table :data="special_tb_data"   style="width: 100%" ref="special_tb" @row-click="specal_tb_row_click();">
-            <el-table-column label="" type="expand">
+            <!-- <el-table-column label="" type="expand">
                 <template slot-scope="scope">
                     <el-form label-position="left" inline>
                     <el-row  v-for="(step,step_idx) in scope.row.tb_steps" :key=step_idx  style="margin-top:5px;" >
@@ -16,7 +16,7 @@
                     </el-row>
                     </el-form>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="商品名称" prop="goods_name" >                
             </el-table-column>
             <el-table-column label="商品规格" prop="sku_spec_name">
@@ -29,6 +29,10 @@
                     <el-button  @click.native.prevent="specal_opt(scope.$index,scope.row,'save')"  type="text"  size="small"> 保存 </el-button> 
                     <el-button  @click.native.prevent="specal_opt(scope.$index,scope.row,'del')"  type="text"  size="small"> 删除 </el-button>                     
                     <el-button  @click.native.prevent="specal_opt(scope.$index,scope.row,'restore')"  type="text"  size="small"> 恢复 </el-button>
+                    
+                    <el-button  @click="specal_set(scope.$index,scope.row,'view_step')"  type="text"  size="small"> 配置制作步骤 </el-button> 
+                    <el-button  @click.native.prevent="sku_del(scope.$index,scope.row,'save')"  type="text"  size="small"> 删除当前sku </el-button> 
+
                 </template>
             </el-table-column>
         </el-table>
@@ -437,8 +441,15 @@ export default {
             }).catch(function(cat){
                 return cat
             })
+        },
+        specal_set(){
+
+        },
+        sku_del(){
+            
         }
 
+
     }
     
 }