出库结算管理

src/main/resources/static/app/business/contractReceive/service/contractReceiveService.js

@@ -2,7 +2,7 @@
 
 angular.module('app.business').service("contractReceiveService", function($http, $q, APP_CONFIG,$rootScope) {
     //盘点列表
-	this.getPageInfo = function(pageNum, pageSize, htbh, houseId, warehouseId, htlx){
+	this.getPageInfo = function(pageNum, pageSize, htbh, houseId, warehouseId, htlx, surplus){
 		var d = $q.defer();
 		$http({
 			method : 'GET',
@@ -14,7 +14,8 @@ angular.module('app.business').service("contractReceiveService", function($http,
                 houseId: houseId,
                 warehouseId: warehouseId,
                 htlx: htlx,
-                orgId: $rootScope.userInfo.orgId
+                orgId: $rootScope.userInfo.orgId,
+                surplus: surplus
 			}
 		}).then(function successCallback(response) {
 			// 请求成功执行代码

src/main/resources/static/app/business/deliveryStorageNotice/controller/receiveContractListModalCtrl.js

@@ -10,7 +10,8 @@ angular.module('app.business').controller("receiveContractListModalCtrl",
     			null,
     			items.houseId,
     			items.warehouseId,
-    			items.htlx).then(function (data) {
+    			items.htlx,
+                items.surplus).then(function (data) {
             $scope.pageInfo = data;
         }, function (data) {
             console.log(data);

src/main/resources/static/app/business/jsgl/controller/jsglCtrl.js

@@ -73,9 +73,14 @@ angular.module('app.business')
     $scope.jslx = $stateParams.jslx;
     if ($scope.jslx == "0") {
     	$scope.top_title = "入库结算详情";
+        $scope.sectionHide = true;
     	
     } else if ($scope.jslx == "1") {
     	$scope.top_title = "出库结算详情";
+    	$scope.sectionHide = false;
+        // 非必填
+        $('#remarks').attr("required", "true");
+        $scope.isNotHide = true;
     }
     var isNotEdit = false;//大多数文本框
     var isEdit = false;//少数要控制的文本框
@@ -87,6 +92,7 @@ angular.module('app.business')
 			$scope.jsgl = data;
 			$scope.jsgl.orgId = $rootScope.orgInfo.orgId;
 			$scope.loadWare($scope.jsgl.houseId);
+            $scope.remarksChange();
 	    },function(data){
 	        console.log(data);
 	    });
@@ -124,8 +130,11 @@ angular.module('app.business')
 		var params = [];
 		if ($scope.jslx == "0") {//入库
 			params.htlx = "0";
+			// 非字段条件-业务特殊需求(剩余数量为“0”的合同不展示在列表中)
+			params.surplus = "0";
 		} else if ($scope.jslx == "1") {//出库
 			params.htlx = "1";
+            params.surplus = "1";
 		} else {
 			alert("系统异常，请联系管理员!");
 			return;
@@ -193,6 +202,43 @@ angular.module('app.business')
 	 * 计算本次结算金额 = 本次结算数量 * 本次结算单价
 	 * 保留两位小数
 	 */
+    //将v四舍五入，且保留n位小数
+    $scope.getMath_N = function(v, n) {
+        if (isNaN(v) || v == "") {
+            if (isNaN(n) || v == "") {
+                v = "0.00";
+            } else if (n == 0) {
+                v = "0";
+            } else {
+                v = "";
+                for (var i = 1; i <= n; i++) {
+                    if (i == 1) {
+                        v = "0.0";
+                    } else {
+                        v = v+"0";
+                    }
+                }
+            }
+        } else {
+            v = Math.round(v*100)/100;
+            v = v.toString();
+            var rs = v.indexOf('.');
+            if (rs < 0) {
+                if (n > 0) {
+                    for (var i = 1; i <= n; i++) {
+                        if (i == 1) {
+                            v = v+".0";
+                        } else {
+                            v = v+"0";
+                        }
+                    }
+                }
+            }else{
+                while(v.length <= rs + n){v += '0';}
+            }
+        }
+        return v;
+    };
 	$scope.calculate = function() {
 		var bcjssl = $scope.jsgl.bcjssl;
 		var bcjsdj = $scope.jsgl.bcjsdj;
@@ -217,7 +263,21 @@ angular.module('app.business')
 		 */
 		var bcjsje = $scope.jsgl.bcjssl * 1000 * $scope.jsgl.bcjsdj * 1000 / 1000000;
 		$scope.jsgl.bcjsje = $scope.getMath_N(bcjsje, 2);
-	}
+	};
+
+    // 备注必填效验
+    $scope.remarksChange = function() {
+        // 本次结算单价,本次结算金额
+		if ($scope.jsgl.bcjsdj==='0' || $scope.jsgl.bcjsje==='0' || $scope.jsgl.bcjsje==='0.00') {
+			// 备注必填
+			$('#remarks').attr("required", "false");
+            $scope.isNotHide = false;
+		} else {
+            // 非必填
+            $('#remarks').attr("required", "true");
+            $scope.isNotHide = true;
+		}
+    };
 
 	// 返回.
     $scope.retList = function () {

src/main/resources/static/app/business/jsgl/views/jsgl-edit.html

@@ -102,16 +102,15 @@
                                         <section class="col col-4">
                                             <label class="label">本次结算单价(元/吨)<span style="color: red;">*</span></label>
                                             <label class="input"> 
-                                            	<input class="form-control" type="text" ng-model="jsgl.bcjsdj" ng-readonly="isNotEdit" ng-blur="calculate()"
+                                            	<input class="form-control" type="text" ng-model="jsgl.bcjsdj" ng-readonly="isNotEdit" ng-blur="calculate()" ng-change="remarksChange()"
                                                 name="bcjsdj" placeholder="" onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " required />
                                             </label>
-                                         	</label>
                                         </section>
                                         <section class="col col-4">
                                             <label class="label">本次结算金额(元)<span style="color: red;">*</span></label> 
                                             <label class="input"> 
                                                 <input class="form-control" type="text" ng-model="jsgl.bcjsje" ng-readonly="isNotEdit"
-                                                name="bcjsje" placeholder="" required />
+                                                name="bcjsje" placeholder="" ng-change="remarksChange()" required />
                                             </label>
                                         </section>
                                     	<section class="col col-4">
@@ -133,6 +132,13 @@
                                              	</select>
                                          	</label>
                                         </section>
+                                        <section class="col col-8" ng-hide="sectionHide">
+                                            <label class="label">备注<span ng-hide="isNotHide" style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input id="remarks" class="form-control" type="text" ng-model="jsgl.remarks" ng-readonly="isNotEdit"
+                                                       name="remarks" placeholder="备注"/>
+                                            </label>
+                                        </section>
                                     </div>
                                 </fieldset>
                                 <header><strong>发票信息</strong></header>