Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_storageCtrl.js

@@ -126,7 +126,7 @@ define([ 'app/app' ], function(app) {
                 })
             } else {
                 for (var i = 0; i< $scope.countData; i++) {
-                    $scope.otherData.push({qty: '', id: '', price: '', key: '', show: false, newId: true})
+                    $scope.otherData.push({qty: '', id: '', price: '', key: '', erpReserve: '', show: false, newId: true})
                 }
             }
         }
@@ -296,6 +296,7 @@ define([ 'app/app' ], function(app) {
                     val.spec = '';
                     val.qty = '';
                     val.price = '';
+                    val.erpReserve = '';
                 }
             })
         }
@@ -324,6 +325,7 @@ define([ 'app/app' ], function(app) {
                     type.spec = '';
                     type.qty = '';
                     type.price = '';
+                    type.erpReserve = '',
                     $scope.listData = [];
                     type.show = false;
                 } else {
@@ -353,10 +355,10 @@ define([ 'app/app' ], function(app) {
             if(type === 'clear') {
                 initOtherData()
             } else if(type === 'one') {
-                $scope.otherData.push({qty: '', id: '', price: '', key: '', show: false, newId: true});
+                $scope.otherData.push({qty: '', id: '', price: '', key: '', erpReserve: '', show: false, newId: true});
             } else if(type === 'ten') {
                 for (var i = 0; i< 10; i++) {
-                    $scope.otherData.push({qty: '', id: '', price: '', key: '', show: false, newId: true})
+                    $scope.otherData.push({qty: '', id: '', price: '', key: '', erpReserve: '', show: false, newId: true})
                 }
             }
         };