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

+ 9 - 1
src/main/webapp/resources/js/index/app.js

@@ -24178,10 +24178,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             };
 
             // 明细
-            $scope.checkItem = function (item) {
+            $scope.checkItem = function (item, order) {
                 item.checked = !item.checked;
                 if (item.checked) {
                     checkItems.push(item);
+                    if ($scope.checkedOrder == null) {
+                        $scope.checkedOrder = order;
+                    }
+                    order.checked = true;
                 } else {
                     angular.forEach(checkItems, function (checkItem) {
                        if (checkItem.id == item.id) {
@@ -24189,6 +24193,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                        }
                     });
                 }
+                if (checkItems.length == 0) {
+                    $scope.checkedOrder = null;
+                    order.checked = false;
+                }
             };
 
             // 搜索框回车

+ 4 - 3
src/main/webapp/resources/tpl/index/purc/change_new.html

@@ -213,7 +213,7 @@
                                     <span class="input-group-btn">
                                         <button class="btn btn-sm" type="button" ng-click="getEnableOrders()"><i class="fa fa-search"></i></button>
                                     </span>
-                                    <input type="text" ng-model="change.orderCode" class="form-control" readonly>
+                                    <input type="text" ng-model="change.orderCode" class="form-control" ng-click="getEnableOrders()" readonly>
                                 </div>
                             </div>
                         </li>
@@ -234,11 +234,12 @@
                             </div>
                             <div class="fr">
                                 <em>新付款方式:</em>
-                                <select name="" class="select" ng-model="change.newPayments" ng-required="true">
+                                <input ng-model="change.newPayments" list="newPayments" class="select"  placeholder="选择付款方式" />
+                                <datalist id="newPayments">
                                     <option value="月结30天">月结30天</option>
                                     <option value="月结60天">月结60天</option>
                                     <option value="现金支付">现金支付</option>
-                                </select>
+                                </datalist>
                                 <!--<span><input type="text" class="input01" ng-model="change.newPayments"></span>-->
                             </div>
                         </li>

+ 3 - 3
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">
+                           ng-disabled="checkedOrder != null && checkedOrder.id != order.id" >
                 </td>
                 <td class="first" colspan="4">
                     <div class="order-main">
@@ -238,8 +238,8 @@
                 </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)" ng-checked="item.checked"
-                           ng-disabled="checkedOrder == null || (checkedOrder != null && checkedOrder.id != order.id)">
+                <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>
                 <td class="product">
                     <div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}"