Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

src/views/Inventory/InventoryManagement/index.vue

@@ -49,7 +49,7 @@
               plain
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
-            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">新增货位</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -91,13 +91,11 @@
             <el-button
               size="mini"
               icon="el-icon-edit"
-              plain
-              type="warning"
+              type="primary"
               @click="handleLocateEdit(scope.row)">修改</el-button>
             <el-button
               size="mini"
               type="danger"
-              plain
               icon="el-icon-delete"
               @click="locateDelete(scope.row)">删除</el-button>
           </template>