Merge remote-tracking branch 'origin/feature-material-wangcz' into feature-material-wangcz

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

@@ -419,11 +419,11 @@ define(['app/app'], function(app) {
                 sendInfo.logisticsInfo.companyName = $scope.logistics.companyName;
                 sendInfo.logisticsInfo.number = $scope.logistics.number;
             }
-            var _obj = {}
+            var _obj = []
             for (var i = 0; i < $scope.checkinvoice.purchaseDetails.length; i++) {
                 if (Math.abs($scope.checkinvoice.purchaseDetails[i].sendCount) > 0) {
                   var _id = $scope.checkinvoice.purchaseDetails[i].id
-                  _obj[_id] = $scope.checkinvoice.purchaseDetails[i].sendCount
+                  _obj.push({id: _id, qty: $scope.checkinvoice.purchaseDetails[i].sendCount})
                 }
             }
             sendInfo.map = _obj
@@ -521,22 +521,30 @@ define(['app/app'], function(app) {
                     return false;
                 }
             }else {
-                if ($scope.logistics.companyName && $scope.logistics.companyName != '请选择物流公司'){
-                    if (!$scope.logistics.number){
-                        toaster.pop("error", "注意", '请完善快递信息');
-                        return false;
-                    }
-                }
+                // if ($scope.logistics.companyName && $scope.logistics.companyName != '请选择物流公司'){
+                //     if (!$scope.logistics.number){
+                //         toaster.pop("error", "注意", '请完善快递信息');
+                //         return false;
+                //     }
+                // }
+                  if (!$scope.logistics.companyName) {
+                    toaster.pop("error", "注意", '请选择物流公司');
+                    return false;
+                  }
+                  if (!$scope.logistics.number){
+                    toaster.pop("error", "注意", '请输入的物流单号');
+                    return false;
+                  }
                 if ($scope.logistics.number){
                     var patt = new RegExp("^[A-Za-z0-9]+$");
                     if (!patt.test($scope.logistics.number)){
                         toaster.pop("error", "注意", '请输入正确的物流单号');
                         return false;
                     }
-                    if (!$scope.logistics.companyName || $scope.logistics.companyName == '请选择物流公司'){
-                        toaster.pop("error", "注意", '请完善快递信息');
-                        return false;
-                    }
+                    // if (!$scope.logistics.companyName || $scope.logistics.companyName == '请选择物流公司'){
+                    //     toaster.pop("error", "注意", '请完善快递信息');
+                    //     return false;
+                    // }
                 }
             }
             return true;

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

@@ -478,7 +478,9 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       });
     };
     // 批量删除
-    $scope.deleteBatch = function() {
+    $scope.deleteBatch = function(event) {
+      var e = e || event
+      e.stopPropagation()
       $scope.getChoosedInfo();
       if (!$scope.choosedIds || $scope.choosedIds.length == 0) {
         toaster.pop('info', '请选择要删除的信息');
@@ -556,6 +558,8 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           $scope.choosedIds = [];
           $scope.currenctMaterial = []
           loadDataReload();
+          $scope.chooseAll = false;
+          $scope.chooseAllPage = false
         } else if ($scope.$$nonProduct.deleteGoods) {
           if (!response || !response.id) {
             loadData();
@@ -999,7 +1003,9 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     }
 
     // 一键添加到个人产品库
-    $scope.setAllInPerson = function() {
+    $scope.setAllInPerson = function(event) {
+      var e = e || event
+      e.stopPropagation()
       if ($scope.chooseAllPage) {
         if ('standard' == $scope.standard_tab) {
           $scope.setPrArg = {
@@ -1363,6 +1369,8 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     $scope.getLoadSource = function(people) {
       $scope.param.page = 1
       $scope.chooseTypePeople = people
+      $scope.chooseAll = false;
+      $scope.chooseAllPage = false
       loadData()
     }
     var loadData = function() {
@@ -3818,6 +3826,14 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         return
       }
 
+      for (var i = 0; i < $scope.productUpOff.goods.length; i++) {
+        $scope.productUpOff.goods[i].rMBNTPrice = ''
+        $scope.productUpOff.goods[i].end = '999999999'
+        if ($scope.productUpOff.goods[i + 1]) {
+          $scope.productUpOff.goods[i].end = parseInt($scope.productUpOff.goods[i].start) - 1
+        }
+      }
+
       // 先判断是自营店铺 还是 寄售店铺
       // var _selfSale = $scope.productUpOff.goods.selfSale
       if ($scope.storeInfo.uuid) { // 如果是自营店铺

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1050,13 +1050,13 @@
 				<div style="clear:both"></div>
 				<div class="check" style="margin-left: 12px;color: #666; font-size: 14px;margin-top: 20px;">
 					更多操作：
-					<div class="operate-btn" ng-click="setAllInPerson()" ng-if="chooseTypePeople === 'all'"><span>加入我的产品库</span></div>
+					<div class="operate-btn" ng-click="setAllInPerson($event)" ng-if="chooseTypePeople === 'all'"><span>加入我的产品库</span></div>
 					<div class="operate-btn"><span>入库</span></div>
 					<div class="operate-btn"><span>出库</span></div>
-					<div class="operate-btn" ng-click="download()"><span>导出选中</span></div>
-					<div class="operate-btn" ng-click="modifyBatch()"><span>批量修改</span></div>
+					<div class="operate-btn" ng-click="download($event)"><span>导出选中</span></div>
+					<div class="operate-btn" ng-click="modifyBatch($event)"><span>批量修改</span></div>
 					<!--<div class="operate-btn" ng-show="standard_tab == 'unstandard'" ng-click="matchAll()"><span ng-show="standard_tab == 'unstandard'">匹配</span></div>-->
-					<div class="operate-btn" ng-click="deleteBatch()"><span>删除选中</span></div>
+					<div class="operate-btn" ng-click="deleteBatch($event)"><span>删除选中</span></div>
 					<span class="check-btn" ng-show="isBatch">
 						<a ng-click="deleteBatch()" name="delete-material">删除</a>
 						<a ng-click="exitBatch()">取消</a>