Browse Source

信扬单据列表隐藏复制按钮,单据提交时增加提示,如果该单的采购总额大于300W,给出提示,并且不能提交

hejq 8 years ago
parent
commit
099619b922

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

@@ -16938,8 +16938,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 toaster.pop('info', '提示', '交货时间未选择');
             }  else if (!$scope.orderCodeEnable) {
                 toaster.pop('info', '提示', '采购单号重复');
-            }else {
-                angular.forEach($scope.deOrder.deputyOrderItems, function (orderitem, index) {
+            } else if ($scope.deOrder.totalpayament >= 3000000) {
+                toaster.pop('error', '提示', '单张订单委托采购总金额不得超过300万美金,');
+            } else {
+                    angular.forEach($scope.deOrder.deputyOrderItems, function (orderitem, index) {
                     if (orderitem.prodname == null) {
                         toaster.pop('info', '提示', '订单明细第' + (index + 1) + '行产品名称未填写');
                     } else if (orderitem.prodcode == null) {
@@ -16955,7 +16957,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     } else if (orderitem.purcprice == null) {
                         toaster.pop('info', '提示', '订单明细第' + (index + 1) + '行订单单价未填写');
                     } else {
-                        $scope.checkresult = true;
                         $scope.checkresult = true;
                         if ($scope.deOrder.entrystatus == '保存') {
                             $scope.isSave = true;
@@ -16963,7 +16964,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                             $scope.isSubmit = true;
                         }
                     }
-                });
+                })
+            };
             }
         }
 
@@ -17435,7 +17437,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 toaster.pop('info', '提示', '交货时间未选择');
             } else if (!$scope.orderCodeEnable) {
                 toaster.pop('info', '提示', '采购单号重复');
-            }else {
+            } else if ($scope.deOrder.totalpayament >= 3000000) {
+                toaster.pop('error', '提示', '单张订单委托采购总金额不得超过300万美金,');
+            } else {
                 angular.forEach($scope.deOrder.deputyOrderItems, function (orderitem, index) {
                     if (orderitem.prodname == null) {
                         toaster.pop('info', '提示', '订单明细第' + (index + 1) + '行产品名称未填写');

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

@@ -346,9 +346,9 @@
                                     <i class="fa fa-print fa-lg"></i>
                                 </a>
                             </div>
-                            <div>
-                                <a ng-click="copyorder(order.id)" title="复制生成一张新的订单,除了采购单号和合同编号不同,其他信息基本相同">复制</a>
-                            </div>
+                            <!--<div>-->
+                                <!--<a ng-click="copyorder(order.id)" title="复制生成一张新的订单,除了采购单号和合同编号不同,其他信息基本相同">复制</a>-->
+                            <!--</div>-->
                             <div ng-if="order.entrystatus == '保存'">
                                 <a ng-click="clear(order.id)" title="只有新增的在录入的单据可以删除">删除</a>
                             </div>