Merge remote-tracking branch 'origin/yjb_ScrmStores' into yjb_ScrmStores

src/views/his/article/index.vue

@@ -156,7 +156,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250px">
         <template slot-scope="scope">
           <el-button
             size="mini"