代采订单增加必填字段限制

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8437 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/js/index/app.js

@@ -11706,6 +11706,31 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$scope.deOrder.$editing = false;
 		}
 		
+		// 保存
+		$scope.save = function() {
+			$scope.deOrder.entrystatus = '保存';
+			angular.forEach($scope.deOrder.deputyOrderItems, function(item) {
+				$scope.deOrder.totalamount += item.amount * item.unitprice;
+				$scope.deOrder.totalpayament += item.amount * item.unitprice;
+			});
+			if($scope.deOrder.deputyOrderItems[0].prodcode == null) {
+				toaster.pop('info', '提示', '您还未填写任何商品信息');
+			} else {
+				DeputyOrder.saveDeOrder({deOrder: $scope.deOrder}, {}, function(data) {
+					if(data.id) {
+						toaster.pop('success', '提示', '保存成功');
+						window.location.reload();
+					}
+					if(data.error) {
+						toaster.pop('error', '提示', '保存失败');
+					}
+				}, function(response) {
+					
+				});
+			}
+		}
+		
+		// 提交
 		$scope.submit = function() {
 			$scope.deOrder.entrystatus = '已提交';
 			DeputyOrder.saveDeOrder({deOrder: $scope.deOrder}, {}, function(data) {

src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -137,7 +137,7 @@
 </style>
 <div class="warp">
     <div class=" purchase">
-        <div class="width100">
+        <form class="width100" name="order">
            <!-- <div class="com_title">服务>采购模块><font>>代采订单</font></div>-->
             <div class="com_head"><span>代采订单</span></div>
             <div class="purchase_form">
@@ -556,12 +556,13 @@
                     </ul>
                 </div>
                 <div class="save" >
-                	<span ng-if="deOrder.entrystatus == '保存'"><a href="#" ng-click="submit()">提交</a></span>
-                	<span  ng-if="!deOrder.$editing && deOrder.entrystatus == '保存'"><a ng-click="update()">更新</a></span>
-                	<span ng-if="deOrder.$editing && deOrder.entrystatus == '保存'"><a ng-click="cancel()">取消</a></span>
+                	<span ng-if="deOrder.entrystatus == '保存'"><button ng-click="submit()" ng-disabled="order.$invalid">提交</button></span>
+                	<span  ng-if="!deOrder.$editing && deOrder.entrystatus == '保存'"><button ng-click="update()">更新</button></span>
+                	<!-- <span ng-if="deOrder.$editing && deOrder.entrystatus == '保存'"><a ng-click="cancel()">取消</a></span> -->
+                	<span ng-if="deOrder.$editing && deOrder.entrystatus == '保存'"><button ng-click="save()" ng-disabled="order.$invalid">保存</button></span>
                 </div>
             </div>
-        </div>
+        </form>
     </div>
 </div>
 </body>

src/main/webapp/resources/tpl/index/purc/deputyOrder_new.html

@@ -145,7 +145,7 @@
 </style>
 <div class="warp">
     <div class=" purchase">
-        <div class="width100">
+        <form class="width100" name="order">
             <!--<div class="com_title">服务>采购模块><font>>代采订单</font></div>-->
             <div class="com_head"><span>代采订单</span></div>
             <div class="purchase_form">
@@ -561,11 +561,11 @@
                     </ul>
                 </div>
                 <div class="save">
-                	<button ng-click="save()">保存</button>
-                	<button ng-click="submit()">提交</button>
+                	<button ng-click="save()" ng-disabled="order.$invalid">保存</button>
+                	<button ng-click="submit()" ng-disabled="order.$invalid">提交</button>
                 </div>
             </div>
-        </div>
+        </form>
     </div>
 </div>
 </body>