Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -262,7 +262,7 @@ define(['app/app'], function (app) {
             // }
             Enterprise.removeUser({uu: user.userUU}, function () {
                 toaster.pop('success', '提示', '用户删除成功。');
-                $scope.tableParams.page(1);
+                // $scope.tableParams.page(1);
                 $scope.tableParams.reload();
                 $scope.showDelUserFlag = false;
             }, function (response) {

src/main/webapp/resources/js/usercenter/controllers/forstore/bomListDetailCtrl.js

@@ -277,7 +277,15 @@ define(['app/app'], function(app) {
             }, function (err) {
                 toaster.pop('error', err.data);
             })
-        }
+        };
+
+        // 新增单条物料信息
+        $scope.addNewBom = function () {
+            $scope.bomData.seekPurchaseByBatchs.unshift({});
+            $scope.setEditBom(true);
+            $scope.onCheckAllCheck();
+        };
+
         // 删除BOM提示框
         $scope.showDeleteBomBox = false;
         $scope.setShowDeleteBomBox = function (flag) {

src/main/webapp/resources/view/usercenter/forstore/bomListDetail.html

@@ -211,6 +211,7 @@
         <button class="operate-btn" ng-click="setEditBom(true)">编辑BOM</button>
         <button class="operate-btn" ng-click="deleteProduct()">删除物料</button>
         <button class="operate-btn" ng-click="deleteBom()">删除本BOM</button>
+        <button class="operate-btn" ng-click="addNewBom()">新增物料</button>
         <div class="fr" ng-show="editBom || editSeek">
             <button class="sure-btn" ng-click="sure(true)">确认</button>
             <button class="sure-btn cancel-btn" ng-click="sure(false)">取消</button>