aship/aship#3 防伪码功能-作废重打

src/main/java/com/i1/srm/am/entity/Function.java

@@ -18,7 +18,7 @@ public enum Function {
     //1采购协同管理
     PURCHASE_ORDER_FUNCTION(1, 11, "采购单管理", Lists.newArrayList(QUERY, VIEW, RETURN, EXPORT, GEN_BARCODE, PRINT_BARCODE)),
     PURCHASE_ORDER_CHANGE_FUNCTION(14, 12, "采购变更单管理", Lists.newArrayList(QUERY, VIEW, EXPORT, RETURN, CONFIRM, RETURN_ACCEPT, RETURN_REJECT, CONFIRM_ACCEPT, CONFIRM_REJECT)),
-    BARCODE(92,13,"防伪码作废重打", Lists.newArrayList(VOID_BARCODE,PRINT_BARCODE,GET_BARCODE_STATUS)),
+    BARCODE(92,13,"防伪码作废补打", Lists.newArrayList(VOID_BARCODE,PRINT_BARCODE,GET_BARCODE_STATUS)),
 
     //2送货协同管理
     DELIVERY_ORDER_FUNCTION(2, 21, "送货单管理", Lists.newArrayList(QUERY, CREATE, UPDATE, VIEW, DELETE, CREATE_LABEL, UPDATE_LABEL, RELEASE, UNDO_RELEASE, EXPORT)),

src/main/resources/static/app/srm/barcode/barcode.js

@@ -36,7 +36,7 @@
         vm.currentAcl = currentAcl.data;
         //variables
         vm.subPages = {
-            'index': {name: '防伪码作废/重打', show: true, closable: false, url: 'app/srm/barcode/query/query.html'},
+            'index': {name: '防伪码作废/补打', show: true, closable: false, url: 'app/srm/barcode/query/query.html'},
         };
     }
 })();
\ No newline at end of file

src/main/resources/static/app/srm/barcode/query/query.html

@@ -15,7 +15,7 @@
 
             <div class="col-md-4">
                 <div class="form-group">
-                    <label>防伪码</label>
+                    <label>条码</label>
                     <input class="form-control" ng-change="barcodeChange()" ng-model="queryCondition.barcode" required
                            type="text">
                 </div>
@@ -56,7 +56,7 @@
                 </button>
                 <button acl-check class="btn btn-primary plm prm" func=" 'BARCODE_FUNCTION' " ng-click="print()"
                         ng-disabled="!okStatus" resource=" 'PRINT_BARCODE' ">
-                    <i class='fa fa-print'></i>&nbsp;&nbsp;重打
+                    <i class='fa fa-print'></i>&nbsp;&nbsp;补打
                 </button>
             </div>
         </div>

src/main/resources/static/app/srm/barcode/query/query.js

@@ -52,7 +52,7 @@ angular.module('IOne').controller('BarcodeQueryController', function ($scope, Co
             function (response) {
                 if (response.data && response.data.code === '0') {
                     if (response.data.printUrls.length === 0) {
-                        UtilService.showWarn("没有可打印的防伪码");
+                        UtilService.showWarn("没有可打印的条码");
                         return;
                     }
                     angular.forEach(response.data.printUrls, function (url) {
@@ -63,10 +63,10 @@ angular.module('IOne').controller('BarcodeQueryController', function ($scope, Co
                         }
                     });
                 } else {
-                    UtilService.showError("打印防伪码失败:<br>" + response.data.message);
+                    UtilService.showError("打印失败:<br>" + response.data.message);
                 }
             }, function (response) {
-                UtilService.showError("打印防伪码失败:<br>" + response.data);
+                UtilService.showError("打印失败:<br>" + response.data);
             }
         )
     };