Преглед изворни кода

1、应收对账,对账列表勾选框点击后无法选择此行
2、应收对账,自定义结束日期选择器被右侧导航遮挡

shenjunjie пре 7 година
родитељ
комит
972b413f72

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

@@ -10085,6 +10085,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 点击其中一个明细的复选框
         $scope.checkOne = function (check) {
+            check.$selected = !check.$selected
+            $scope.Checkall()
+        };
+        $scope.stopPrevent = function(e) {
+            e = e || window.event
+            e.stopPropagation();
+            $scope.Checkall()
+            // event.preventDefault();
+            return false;
+        }
+        $scope.Checkall = function() {
             var result = true;
             angular.forEach($scope.data, function (item) {
                 if (item.$selected != true) {
@@ -10093,7 +10104,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 }
             });
             $scope.checkboxes.checked = result;
-        };
+        }
 
         $scope.haveSelected = false;
 

+ 8 - 3
src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -525,7 +525,7 @@
 							<input type="radio" name="psa" ng-checked="apCheckCondition.$open === true"  ng-model="apCheckCondition.$open" style="vertical-align: middle">自定义
 						</label>
 					</div>
-					<div ng-hide="!apCheckCondition.$open" class="more open date fr" style="margin-top: 14px;">
+					<div ng-hide="!apCheckCondition.$open" class="more open date fr apCheckCondition" style="margin-top: 14px;">
 						<div class="form-inline">
 							<div class="form-group">
 								<div class="form-group input-group input-group-xs input-trigger">
@@ -665,9 +665,9 @@
 			</div>
 			<div class="table-body-wrap">
 				<table class="table table-bordered">
-					<tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
+						<tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
 						<td width="36" style="text-align: center;vertical-align: middle;">
-							<input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected"></td>
+							<input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="stopPrevent($event)"></td>
 						<td width="70">{{::check.ordercode}}</td>
 						<td width="70" title="{{check.prodtitle}}">
 							<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodtitle}}</div>
@@ -797,4 +797,9 @@
     .wui-date-editor .iconfont {
         color: #3f84f6
     }
+
+	.apCheckCondition ul {
+		left: auto !important;
+		right: 0;
+	}
 </style>