Hu Jie 7 лет назад
Родитель
Сommit
c7b2fd246b

+ 12 - 0
src/main/webapp/resources/js/index/app.js

@@ -24166,8 +24166,20 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             // 单选
             $scope.checkOne = function (order) {
                 order.checked = !order.checked;
+                if ((order.checked) && ($scope.checkedOrder != null) && ($scope.checkedOrder != order)) {
+                    $scope.checkedOrder.checked = false;
+                    angular.forEach($scope.checkedOrder.orderItems, function (item) {
+                        item.checked = false;
+                    });
+                    $scope.checkedOrder = null;
+                    checkItems = [];
+                }
                 if (order.checked) {
                     $scope.checkedOrder = order;
+                    angular.forEach(order.orderItems, function (item) {
+                        item.checked = true;
+                        checkItems.push(item);
+                    });
                 } else {
                     $scope.checkedOrder = null;
                     angular.forEach(order.orderItems, function (item) {

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

@@ -221,7 +221,7 @@
                 ng-class="{'text-bold': order.display>0}">
                 <td class="text-center">
                     <input type="checkbox" ng-click="checkOne(order)" ng-checked="order.checked"
-                           ng-disabled="checkedOrder != null && checkedOrder.id != order.id" >
+                            >
                 </td>
                 <td class="first" colspan="4">
                     <div class="order-main">