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

src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -51,13 +51,13 @@ define([ 'app/app' ], function(app) {
                 var currentTime = _getClearDay(new Date());
                 var endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
                 if (val == 'oneMonth') {
-                    $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 } else if (val == 'threeMonth') {
-                    $scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 } else if (val == 'sixMonth') {
-                    $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 }
             }

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -694,12 +694,14 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
 
           $scope.offerCount = 0;
           $scope.goodsCount = 0;
-              $scope.replaceOfferCount = 0;
+          $scope.replaceOfferCount = 0;
           $scope.currentSeek = {};
           $scope.setSeekStatus = function (seek, status, isDisabled) {
               if (isDisabled) {
                   return;
               }
+              $scope.selectAmount = 0;
+              $scope.selectPrice = 0;
               if (seek.id != $scope.currentSeek.id) {
                   $scope.isInit = true;
                   $scope.goodsCount = 0;
@@ -731,7 +733,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                                 }
                             }
                         }
-                        seek.$status = $scope.isInit ? $scope.offerCount == 0 ? 3 : 2 : status;
+                        seek.$status = $scope.offerCount == 0 ? 3 : ($scope.isInit ? 2 : status);
                         $scope.isInit = false;
                     }
                 });
@@ -742,9 +744,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             } else if (status == 0) { // 收起
               seek.$status = status;
             }
-            $scope.selectAmount = 0;
-            $scope.selectPrice = 0;
-          }
+          };
 
           $scope.condition = {
             endDateOpen: false,

src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -471,6 +471,17 @@ define(['app/app'], function (app) {
       // 点击其中一个明细的复选框
       $scope.checkOne = function (check) {
           check.$selected = !check.$selected
+
+          $scope.Checkall()
+      };
+      $scope.stopPrevent = function(e) {
+          e = e || window.event
+          e.stopPropagation();
+          $scope.Checkall()
+          // event.preventDefault();
+          return false;
+      }
+      $scope.Checkall = function() {
           var result = true;
           angular.forEach($scope.data, function (item) {
               if (item.$selected != true) {
@@ -479,8 +490,7 @@ define(['app/app'], function (app) {
               }
           });
           $scope.checkboxes.checked = result;
-      };
-
+      }
       $scope.haveSelected = false;
 
       //生成应收对账单
@@ -679,24 +689,30 @@ define(['app/app'], function (app) {
           }
       };
       $scope.addMouth = function(val) {
-          var _sp = new Date().getMonth() + 1
+          var _sp = new Date()
           var _time = new Date($scope.thisMouth)
           _time.setMonth(_time.getMonth() + val)
-          if (_time.getMonth() + 1 >= Number(_sp)) {
+          _time.setDate(1)
+          _time.setMonth(_time.getMonth() + 1)
+          _time.setDate(_time.getDate() - 1)
+          if (_time.getTime() >= _sp.getTime()) {
               $scope.MouthinShow = false
           } else {
               $scope.MouthinShow = true
           }
           $scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
           $scope.apCheckCondition.$open = false
-          this.searchOrder()
+          $scope.searchOrder()
       }
 
       $scope.addMouthOut = function(val) {
-          var _sp = new Date().getMonth() + 1
+          var _sp = new Date()
           var _time = new Date($scope.thisMouthOut)
           _time.setMonth(_time.getMonth() + val)
-          if (_time.getMonth() + 1 >= Number(_sp)) {
+          _time.setDate(1)
+          _time.setMonth(_time.getMonth() + 1)
+          _time.setDate(_time.getDate() - 1)
+          if (_time.getTime() >= _sp.getTime()) {
               $scope.MouthOutShow = false
           } else {
               $scope.MouthOutShow = true
@@ -724,6 +740,16 @@ define(['app/app'], function (app) {
               return
           }
           if (newVal !== oldVal) {
+              var _d = new Date(newVal)
+              _d.setDate(1)
+              _d.setMonth(_d.getMonth() + 1)
+              _d.setDate(_d.getDate() - 1)
+
+              if (_d.getTime() >= _fromDate.getTime()) {
+                  $scope.MouthOutShow = false
+              } else {
+                  $scope.MouthOutShow = true
+              }
               $scope.tableParams.page(1);
               $scope.tableParams.reload();
           }
@@ -742,12 +768,23 @@ define(['app/app'], function (app) {
               return
           }
           if (newVal !== oldVal) {
+              var _d = new Date(newVal)
+              _d.setDate(1)
+              _d.setMonth(_d.getMonth() + 1)
+              _d.setDate(_d.getDate() - 1)
+
+              if (_d.getTime() >= _fromDate.getTime()) {
+                  $scope.MouthinShow = false
+              } else {
+                  $scope.MouthinShow = true
+              }
               $scope.searchOrder()
           }
       })
 
 
-    /**
+
+      /**
      * 将日期转化为整数日期
      */
     var getDateTime = function (date) {

src/main/webapp/resources/view/sso/b2b/searchresult.html

@@ -316,8 +316,8 @@
 				<div class="col-xs-9">
 					<div class="search">
 						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称等关键词进行搜索" />
-							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称等关键词进行搜索" />
+							<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
 						</div>
 					</div>
 				</div>

src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -522,7 +522,8 @@
       <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 未对账</a></li>
       <!--<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待确认(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>-->
       <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已对账</a></li>
-      <li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已作废(<em ng-class="{'color-black': !unread.cancelled }" ng-bind="unread.cancelled || 0"></em>)</a></li>
+        <!--(<em ng-class="{'color-black': !unread.cancelled }" ng-bind="unread.cancelled || 0"></em>)-->
+      <li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已作废</a></li>
         <li style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()"><img src="/static/img/vendor/images/backIcon.png" width="20"/>返回</li>
     </ul>
   </div>
@@ -603,7 +604,7 @@
                  datepicker-popup="yyyy-MM-dd"
                  is-open="condition.$toOpened"
                  min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
-                 ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
+                     ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
                  datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
                  style="width: 130px"
           />
@@ -731,7 +732,7 @@
                   </div>
               </td>
               <td ng-if="check.totalCount.length === 0">-</td>
-            <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">立即对账</td>
+            <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">对账详情</td>
           </tr>
         </tbody>
 
@@ -842,7 +843,7 @@
               自定义
             </label>
           </div>
-          <div ng-hide="!apCheckCondition.$open" class="date fr" style="margin-top: 14px;">
+          <div ng-hide="!apCheckCondition.$open" class="date fr apCheckCondition" style="margin-top: 14px;">
             <div class="data-input">
               <input type="text" ng-model="apCheckCondition.dateFrom"
                      class="form-control select-adder" placeholder="起始时间"
@@ -973,7 +974,7 @@
         <table class="table table-bordered">
           <tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
             <td width="36" style="text-align: center;vertical-align: middle;">
-              <input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected"></td>
+              <input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="stopPrevent($event)"></td>
             <td width="70">{{::check.ordercode}}</td>
             <td width="70" title="{{check.prodtitle}}">
               <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodtitle}}</div>
@@ -1135,4 +1136,11 @@
   .wui-date-editor .iconfont {
       color: #3f84f6
   }
+  .apCheckCondition ul {
+      left: auto !important;
+      right: 0;
+  }
+  .wui-date.small .wui-date-picker .month_panel .wui-data-table td {
+      line-height: 20px;
+  }
 </style>