Ver Fonte

前端修改

Hu Jie há 7 anos atrás
pai
commit
2d24de89be

+ 15 - 4
src/main/webapp/resources/js/index/app.js

@@ -24191,6 +24191,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
             // 明细
             $scope.checkItem = function (item, order) {
+                // 先判断选中信息
+                order.checked = true;
+                if ($scope.checkedOrder != null && order.id != $scope.checkedOrder.id) {
+                    $scope.checkedOrder.checked = false;
+                    $scope.checkedOrder = order;
+                    order.checked = true;
+                    angular.forEach(checkItems, function (checkItem) {
+                        checkItem.checked = false;
+                    });
+                    checkItems = [];
+                }
                 item.checked = !item.checked;
                 if (item.checked) {
                     checkItems.push(item);
@@ -24199,10 +24210,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     }
                     order.checked = true;
                 } else {
-                    angular.forEach(checkItems, function (checkItem) {
-                       if (checkItem.id == item.id) {
-                           checkItems.splice(item, 1);
-                       }
+                    angular.forEach(checkItems, function (checkItem, index) {
+                        if (checkItem.id == item.id) {
+                            checkItems.splice(index, 1);
+                        }
                     });
                 }
                 if (checkItems.length == 0) {

+ 1 - 2
src/main/webapp/resources/tpl/index/purc/modal/enableOrderList.html

@@ -238,8 +238,7 @@
                 </td>
             </tr>
             <tr class="order-bd" ng-repeat="item in order.orderItems track by item.id" ng-if="!order.$collapsed ">
-                <td class="text-center"><input type="checkbox" ng-click="checkItem(item, order)" ng-checked="item.checked"
-                           ng-disabled="(checkedOrder != null && checkedOrder.id != order.id)">
+                <td class="text-center"><input type="checkbox" ng-click="checkItem(item, order, $index)" ng-checked="item.checked">
                 </td>
                 <td class="product">
                     <div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}"