商机管理下拉选择样式改版

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

@@ -657,63 +657,40 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             deadlineOpen: false
           };
           // 打开日期选择框
-          $scope.openDatePicker = function ($event, item, openParam, status) {
-            if (status != null) {
-              if (status == 1) {
-                if ($scope.startDate != null) {
-                  return;
-                }
-              }
-              if (status == 2) {
-                if ($scope.endDate != null) {
-                  return;
-                }
-              }
-            }
-            $event.preventDefault();
-            $event.stopPropagation();
-            for (var key in item) {
-              item[key] = false;
-            }
-            item[openParam] = !item[openParam];
-          };
-          $scope.changeEndDate = function () {
-            if ($scope.condition.endDateOpen) {
-              $scope.endDate = $scope.endDate.toString().replace(
-                  /[0-9]{2}:[0-9]{2}:[0-9]{2}/g, '23:59:59');//;'23.59';//DateUtil.yyyyMmDd($scope.endDate.getTime() + 86399000);
-              $scope.endDate = new Date(
-                  formatDateTime(new Date($scope.endDate.toString())));
-            }
-            $scope.vaildDate(false);
-          };
-          $scope.vaildDate = function (isStart) {
-            if ($scope.endDate !== null && $scope.startDate > $scope.endDate) {
-              if (isStart) {
-                alert("开始日期大于结束日期，请重新输入！");
-                $scope.startDate = null;
-              } else {
-                alert("开始日期大于结束日期，请重新输入！");
-                $scope.endDate = null;
-              }
-            }
-          };
-          var formatDateTime = function (date) {
-            var y = date.getFullYear();
-            var m = date.getMonth() + 1;
-            m = m < 10 ? ('0' + m) : m;
-            var d = date.getDate();
-            d = d < 10 ? ('0' + d) : d;
-            var h = 23;
-            var minute = 59;
-            var sec = 59;
-            //minute = minute < 10 ? ('0' + minute) : minute;
-            return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + sec;
+              $scope.condition = [];
+              var start = {
+                  open : false
+              };
+              var end = {
+                  open : false
+              };
+              $scope.condition.push(start);
+              $scope.condition.push(end);
+          $scope.openDatePicker = function ($event, item, openParam) {
+              $event.preventDefault();
+              $event.stopPropagation();
+              openParam === 0 ? $scope.condition[1].open = false : $scope.condition[0].open = false;
+              item[openParam].open = !item[openParam].open;
           };
           // 选择查找日期
-          $scope.onDateCondition = function () {
-            $scope.param.page = 1;
-            $scope.orderTableParams.page(1);
-            $scope.orderTableParams.reload();
+          $scope.onDateCondition = function (bool) {
+              var startTime = $scope.startDate ? $scope.startDate.getTime() : null;
+              var endTime = $scope.endDate ? $scope.endDate.getTime() : null;
+              if (startTime && endTime && startTime > endTime) {
+                  if (bool == 1) {
+                      toaster.pop('info', '起始时间不能大于结束时间');
+                      $scope.startDate = null;
+                  } else {
+                      toaster.pop('info', '结束时间不能小于起始时间');
+                      $scope.endDate = null;
+                  }
+              }
+              if ($scope.endDate && bool == 2) {
+                  $scope.endDate = new Date($scope.endDate.getFullYear(), $scope.endDate.getMonth(), $scope.endDate.getDate())
+                  $scope.endDate = new Date($scope.endDate.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+              }
+                $scope.seekPurchaseTableParams.page(1);
+                $scope.seekPurchaseTableParams.reload();
           };
 
           /*获取时间戳代表的天数*/

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

@@ -4,6 +4,12 @@ define(['app/app'], function(app) {
         $rootScope.active = 'vendor_seek_purchase';
         $scope.seekPurchaseRate = {};
         $scope.offer = {};
+
+        // 发布时间
+        $scope.dateArea = 'ALL';
+        // 求购时间
+        $scope.dateAreaSeek = 'ALL';
+
       seekPurchase.getSeekUrl({}, function(data) {
         var seekUrl = data.url;
         //   var seekUrl = 'http://10.1.51.82:24002';
@@ -21,10 +27,10 @@ define(['app/app'], function(app) {
                 // param.deadline = $scope.deadline;
                 // param.status = $scope.status;
                 filter.keyword = $scope.keyWord;
-                filter.fromDate = $scope.startDate
-                  ? $scope.startDate.getTime() : null;
-                filter.endDate = $scope.endDate ? $scope.endDate.getTime()
-                  : null;
+                filter.fromDate = $scope.startDate ? $scope.startDate.getTime() : null;
+                filter.endDate = $scope.endDate ? $scope.endDate.getTime() : null;
+                filter.fromDelivery = $scope.startDelivery ? $scope.startDelivery .getTime() : null;
+                filter.endDelivery = $scope.endDelivery ? $scope.endDelivery .getTime() : null;
                 param._state = "done";
                 param.overdue = 1;
                 param.filter = filter;
@@ -58,68 +64,148 @@ define(['app/app'], function(app) {
 
         $scope.condition = {endDateOpen:false, startDateOpen: false};
 
-        $scope.openDatePicker = function ($event, item, openParam,status) {
-            if (status != null) {
-                if (status == 1) {
-                    if ($scope.startDate != null) {
-                        return;
-                    }
-                }
-                if (status == 2) {
-                    if ($scope.endDate != null) {
-                        return;
-                    }
-                }
-            }
-            $event.preventDefault();
-            $event.stopPropagation();
-            item[openParam] = !item[openParam];
-            if (openParam == 'startDateOpen') {
-                if (item['endDateOpen']) {
-                    item['endDateOpen'] = !item['endDateOpen'];
-                }
-            } else if (openParam == 'endDateOpen') {
-                if (item['startDateOpen']){
-                    item['startDateOpen'] = !item['startDateOpen'];
-                }
-            }
-        };
-        $scope.changeEndDate = function () {
-            if ($scope.condition.endDateOpen) {
-                $scope.endDate = $scope.endDate.toString().replace(/[0-9]{2}:[0-9]{2}:[0-9]{2}/g, '23:59:59');//;'23.59';//DateUtil.yyyyMmDd($scope.endDate.getTime() + 86399000);
-                $scope.endDate = new Date(formatDateTime(new Date($scope.endDate.toString())));
-            }
-            $scope.vaildDate(false);
-        };
-        $scope.vaildDate = function (isStart) {
-            if ($scope.endDate !== null && $scope.startDate>$scope.endDate){
-                if (isStart) {
-                    alert("开始日期大于结束日期，请重新输入！");
-                    $scope.startDate = null;
-                } else {
-                    alert("开始日期大于结束日期，请重新输入！");
-                    $scope.endDate = null;
-                }
-            }
-        };
-        var formatDateTime = function (date) {
-            var y = date.getFullYear();
-            var m = date.getMonth() + 1;
-            m = m < 10 ? ('0' + m) : m;
-            var d = date.getDate();
-            d = d < 10 ? ('0' + d) : d;
-            var h = date.getHours();
-            var minute = date.getMinutes();
-            var sec = date.getSeconds();
-            minute = minute < 10 ? ('0' + minute) : minute;
-            return y + '-' + m + '-' + d+' '+h+':'+minute+':'+sec;
-        };
-        // 选择查找日期
-        $scope.onDateCondition = function () {
-            $scope.param.page = 1;
-            $scope.orderTableParams.page(1);
-            $scope.orderTableParams.reload();
-        };
+          // 打开日期选择框
+          $scope.condition = [];
+          var start = {
+              open : false,
+              open1: false
+          };
+          var end = {
+              open : false,
+              open1: false
+          };
+          $scope.condition.push(start);
+          $scope.condition.push(end);
+          $scope.openDatePicker = function ($event, item, openParam) {
+              $event.preventDefault();
+              $event.stopPropagation();
+              openParam === 0 ? $scope.condition[1].open = false : $scope.condition[0].open = false;
+              item[openParam].open = !item[openParam].open;
+          };
+          $scope.openDatePickerSeek = function ($event, item, openParam) {
+              $event.preventDefault();
+              $event.stopPropagation();
+              openParam === 0 ? $scope.condition[1].open1 = false : $scope.condition[0].open1 = false;
+              item[openParam].open1 = !item[openParam].open1;
+          };
+          // 选择查找日期
+          $scope.onDateConditionSeek = function (bool) {
+              var startTime = $scope.startDate ? $scope.startDate.getTime() : null;
+              var endTime = $scope.endDate ? $scope.endDate.getTime() : null;
+              if (startTime && endTime && startTime > endTime) {
+                  if (bool == 1) {
+                      toaster.pop('info', '起始时间不能大于结束时间');
+                      $scope.startDate = null;
+                  } else {
+                      toaster.pop('info', '结束时间不能小于起始时间');
+                      $scope.endDate = null;
+                  }
+              }
+              if ($scope.endDate && bool == 2) {
+                  $scope.endDate = new Date($scope.endDate.getFullYear(), $scope.endDate.getMonth(), $scope.endDate.getDate())
+                  $scope.endDate = new Date($scope.endDate.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+              }
+              $scope.seekPurchaseTableParams.page(1);
+              $scope.seekPurchaseTableParams.reload();
+          };
+          $scope.onDateCondition = function (bool) {
+              var startTime = $scope.startDelivery ? $scope.startDelivery.getTime() : null;
+              var endTime = $scope.endDelivery ? $scope.endDelivery.getTime() : null;
+              if (startTime && endTime && startTime > endTime) {
+                  if (bool == 1) {
+                      toaster.pop('info', '起始时间不能大于结束时间');
+                      $scope.startDelivery = null;
+                  } else {
+                      toaster.pop('info', '结束时间不能小于起始时间');
+                      $scope.endDelivery = null;
+                  }
+              }
+              if ($scope.endDelivery && bool == 2) {
+                  $scope.endDelivery = new Date($scope.endDelivery.getFullYear(), $scope.endDelivery.getMonth(), $scope.endDelivery.getDate())
+                  $scope.endDelivery = new Date($scope.endDelivery.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+              }
+              $scope.seekPurchaseTableParams.page(1);
+              $scope.seekPurchaseTableParams.reload();
+          };
+          // 筛选
+          var _formatDate = function (date, fmt) {
+              if (!date) {
+                  return null;
+              }
+              if (typeof date === 'string') {
+                  date = new Date(Date.parse(date.replace(/-/g, '/')));
+              }
+              var o = {
+                  'M+': date.getMonth() + 1, // 月份
+                  'd+': date.getDate(), // 日
+                  'h+': date.getHours(), // 小时
+                  'm+': date.getMinutes(), // 分
+                  's+': date.getSeconds(), // 秒
+                  'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
+                  'S': date.getMilliseconds() // 毫秒
+              }
+              if (/(y+)/.test(fmt)) {
+                  fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+              }
+              for (var k in o) {
+                  if (new RegExp('(' + k + ')').test(fmt)) {
+                      fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
+                  }
+              }
+              return fmt;
+          }
+
+          var _getClearDay = function (date) {
+              return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
+          }
+
+          $scope.setFilters = function (type, val) {
+              $scope[type] = val;
+              if (type == 'dateAreaSeek') {
+                  // 时间筛选
+                  var currentTime = _getClearDay(new Date());
+                  var endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+                  if (val == 'ALL' || val == 'autoDay') {
+                      $scope.startDate = null;
+                      $scope.endDate = null;
+                  } else if (val == 'oneDay') {
+                      $scope.startDate = new Date(currentTime - 24 * 60 * 60 * 1000);
+                      $scope.endDate = endDate;
+                  } else if (val == 'threeDay') {
+                      $scope.startDate = new Date(currentTime - 3 * 24 * 60 * 60 * 1000);
+                      $scope.endDate = endDate;
+                  } else if (val == 'sevenDay') {
+                      $scope.startDate = new Date(currentTime - 7 * 24 * 60 * 60 * 1000);
+                      $scope.endDate = endDate;
+                  } else {
+                      $scope.startDate = null;
+                      $scope.endDate = null;
+                  }
+              }
+              if (type == 'dateArea') {
+                  // 时间筛选
+                  var currentTime = _getClearDay(new Date());
+                  var endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+                  if (val == 'ALL' || val == 'autoDay') {
+                      $scope.startDelivery = null;
+                      $scope.endDelivery = null;
+                  } else if (val == 'oneDay') {
+                      $scope.startDelivery = new Date(currentTime - 24 * 60 * 60 * 1000);
+                      $scope.endDelivery = endDate;
+                  } else if (val == 'threeDay') {
+                      $scope.startDelivery = new Date(currentTime - 3 * 24 * 60 * 60 * 1000);
+                      $scope.endDelivery = endDate;
+                  } else if (val == 'sevenDay') {
+                      $scope.startDelivery = new Date(currentTime - 7 * 24 * 60 * 60 * 1000);
+                      $scope.endDelivery = endDate;
+                  } else {
+                      $scope.startDelivery = null;
+                      $scope.endDelivery = null;
+                  }
+              }
+              $scope.seekPurchaseTableParams.page(1);
+              $scope.seekPurchaseTableParams.reload();
+          }
 
         /*获取时间戳代表的天数*/
         $scope.getDay = function (timeStamp) {

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

@@ -8,6 +8,10 @@ define(['app/app'], function (app) {
           $rootScope.active = 'vendor_seek_purchase';
           $scope.seekPurchaseRate = {};
           $scope.sayType = 'current'; // 报价类型,current为当前，replace为替代料
+
+            // 发布时间
+            $scope.dateArea = 'ALL';
+
           seekPurchase.getSeekUrl({}, function(data) {
             var seekUrl = data.url;
             // var seekUrl = 'http://10.1.51.82:24002';
@@ -273,71 +277,106 @@ define(['app/app'], function (app) {
           }
 
           $scope.condition = {endDateOpen: false, startDateOpen: false};
-
-          $scope.openDatePicker = function ($event, item, openParam, status) {
-            if (status != null) {
-              if (status == 1) {
-                if ($scope.startDate != null) {
-                  return;
-                }
-              }
-              if (status == 2) {
-                if ($scope.endDate != null) {
-                  return;
-                }
-              }
-            }
-            $event.preventDefault();
-            $event.stopPropagation();
-            item[openParam] = !item[openParam];
-            if (openParam == 'startDateOpen') {
-              if (item['endDateOpen']) {
-                item['endDateOpen'] = !item['endDateOpen'];
-              }
-            } else if (openParam == 'endDateOpen') {
-              if (item['startDateOpen']) {
-                item['startDateOpen'] = !item['startDateOpen'];
-              }
-            }
-          };
-          $scope.changeEndDate = function () {
-            if ($scope.condition.endDateOpen) {
-              $scope.endDate = $scope.endDate.toString().replace(
-                  /[0-9]{2}:[0-9]{2}:[0-9]{2}/g, '23:59:59');//;'23.59';//DateUtil.yyyyMmDd($scope.endDate.getTime() + 86399000);
-              $scope.endDate = new Date(
-                  formatDateTime(new Date($scope.endDate.toString())));
-            }
-            $scope.vaildDate(false);
-          };
-          $scope.vaildDate = function (isStart) {
-            if ($scope.endDate !== null && $scope.startDate > $scope.endDate) {
-              if (isStart) {
-                alert("开始日期大于结束日期，请重新输入！");
-                $scope.startDate = null;
-              } else {
-                alert("开始日期大于结束日期，请重新输入！");
-                $scope.endDate = null;
+              // 筛选
+              var _formatDate = function (date, fmt) {
+                  if (!date) {
+                      return null;
+                  }
+                  if (typeof date === 'string') {
+                      date = new Date(Date.parse(date.replace(/-/g, '/')));
+                  }
+                  var o = {
+                      'M+': date.getMonth() + 1, // 月份
+                      'd+': date.getDate(), // 日
+                      'h+': date.getHours(), // 小时
+                      'm+': date.getMinutes(), // 分
+                      's+': date.getSeconds(), // 秒
+                      'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
+                      'S': date.getMilliseconds() // 毫秒
+                  }
+                  if (/(y+)/.test(fmt)) {
+                      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+                  }
+                  for (var k in o) {
+                      if (new RegExp('(' + k + ')').test(fmt)) {
+                          fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
+                      }
+                  }
+                  return fmt;
+              }
+
+              var _getClearDay = function (date) {
+                  return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
+              }
+
+              $scope.setFilters = function (type, val) {
+                  $scope[type] = val;
+                  if (type == 'dateArea') {
+                      // 时间筛选
+                      var currentTime = _getClearDay(new Date());
+                      var endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+                      if (val == 'ALL' || val == 'autoDay') {
+                          $scope.startDate = null;
+                          $scope.endDate = null;
+                      } else if (val == 'oneDay') {
+                          $scope.startDate = new Date(currentTime - 24 * 60 * 60 * 1000);
+                          $scope.endDate = endDate;
+                      } else if (val == 'threeDay') {
+                          $scope.startDate = new Date(currentTime - 3 * 24 * 60 * 60 * 1000);
+                          $scope.endDate = endDate;
+                      } else if (val == 'sevenDay') {
+                          $scope.startDate = new Date(currentTime - 7 * 24 * 60 * 60 * 1000);
+                          $scope.endDate = endDate;
+                      } else {
+                          $scope.startDate = null;
+                          $scope.endDate = null;
+                      }
+                  }
+                  $scope.seekPurchaseTableParams.page(1);
+                  $scope.seekPurchaseTableParams.reload();
               }
-            }
-          };
-          var formatDateTime = function (date) {
-            var y = date.getFullYear();
-            var m = date.getMonth() + 1;
-            m = m < 10 ? ('0' + m) : m;
-            var d = date.getDate();
-            d = d < 10 ? ('0' + d) : d;
-            var h = date.getHours();
-            var minute = date.getMinutes();
-            var sec = date.getSeconds();
-            minute = minute < 10 ? ('0' + minute) : minute;
-            return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + sec;
-          };
           // 选择查找日期
           $scope.onDateCondition = function () {
             $scope.param.page = 1;
             $scope.orderTableParams.page(1);
             $scope.orderTableParams.reload();
           };
+              // 打开日期选择框
+              $scope.condition = [];
+              var start = {
+                  open : false
+              };
+              var end = {
+                  open : false
+              };
+              $scope.condition.push(start);
+              $scope.condition.push(end);
+              $scope.openDatePicker = function ($event, item, openParam) {
+                  $event.preventDefault();
+                  $event.stopPropagation();
+                  openParam === 0 ? $scope.condition[1].open = false : $scope.condition[0].open = false;
+                  item[openParam].open = !item[openParam].open;
+              };
+              // 选择查找日期
+              $scope.onDateCondition = function (bool) {
+                  var startTime = $scope.startDate ? $scope.startDate.getTime() : null;
+                  var endTime = $scope.endDate ? $scope.endDate.getTime() : null;
+                  if (startTime && endTime && startTime > endTime) {
+                      if (bool == 1) {
+                          toaster.pop('info', '起始时间不能大于结束时间');
+                          $scope.startDate = null;
+                      } else {
+                          toaster.pop('info', '结束时间不能小于起始时间');
+                          $scope.endDate = null;
+                      }
+                  }
+                  if ($scope.endDate && bool == 2) {
+                      $scope.endDate = new Date($scope.endDate.getFullYear(), $scope.endDate.getMonth(), $scope.endDate.getDate())
+                      $scope.endDate = new Date($scope.endDate.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+                  }
+                  $scope.seekPurchaseTableParams.page(1);
+                  $scope.seekPurchaseTableParams.reload();
+              };
 
           /*获取时间戳代表的天数*/
           $scope.getDay = function (timeStamp) {

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

@@ -55,10 +55,13 @@
     .seek-purchase .seek-purchase-content .screen {
         font-size: 14px;
         line-height: 32px;
+        clear: both;
+        background: #f5f8fe;
+        margin-bottom: 15px;
+        padding-top: 4px;
+        padding-right: 13px;
     }
-    .seek-purchase .seek-purchase-content .screen .fl {
-        margin-left: 14px;
-    }
+
     .seek-purchase .seek-purchase-content .screen .fl select{
         width: 88px;
         height: 32px;
@@ -78,11 +81,11 @@
     .seek-purchase .seek-purchase-content .screen .sreach input{
         border: #5078cb 1px solid;
         height: 32px;
-        width: 267px;
+        width: 200px;
         box-shadow: none;
     }
     .seek-purchase .seek-purchase-content .screen .sreach .date{
-        margin-right: 6px;
+        margin-right: 20px;
     }
     .seek-purchase .seek-purchase-content .screen .sreach .date input{
         width: 117px;
@@ -594,6 +597,35 @@
         white-space: nowrap;
         text-align: left;
     }
+    /*筛选按钮*/
+    .check-filter {
+        height: auto;
+        line-height: 30px;
+        padding-left: 22px;
+        margin-top: 0;
+    }
+    .check-filter .sreach input {
+        width: 147px;
+    }
+    .check-filter .radio-block {
+        display: inline-block;
+        font-size: 14px;
+        width: 33.3%;
+    }
+    .check-filter .radio-block.date-radio {
+        width: 45%;
+    }
+    .check-filter .radio-block .com-check-radio {
+        font-weight: normal;
+        color: #666;
+        margin-right: 13px;
+    }
+    .check-filter .radio-block .com-check-radio:last-child {
+        margin-right: 0;
+    }
+    label {
+        margin-bottom: 5px;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -628,59 +660,199 @@
         </div>
         -->
         <!--搜索时间筛选-->
-        <div class="screen" style="background: #f5f8fe;height: 40px;margin-bottom: 15px;margin-top: 5px;padding-top: 4px;padding-right: 11px;">
-            <div class="fl">
-                <!--
-                截止时间&nbsp;
-                <select class="form-control select-adder" ng-model="deadline" ng-change="onSearch()" ng-init="deadline='全部'">
-                    <option value="全部">全部</option>
-                    <option value="已截止">已截止</option>
-                    <option value="正在生效">正在生效</option>
-                </select>
-                -->
-                <!--
-                报价状态&nbsp;
-                <select class="form-control select-adder" ng-model="status" ng-change="onSearch()" ng-init="status=200">
-                    <option value="200">待报价</option>
-                    <option value="201">已报价</option>
-                    <option value="202">已采纳</option>
-                </select>
-                -->
+        <!--<div class="screen" style="background: #f5f8fe;height: 40px;margin-bottom: 15px;margin-top: 5px;padding-top: 4px;padding-right: 11px;">-->
+            <!--<div class="fl">-->
+                <!--&lt;!&ndash;-->
+                <!--截止时间&nbsp;-->
+                <!--<select class="form-control select-adder" ng-model="deadline" ng-change="onSearch()" ng-init="deadline='全部'">-->
+                    <!--<option value="全部">全部</option>-->
+                    <!--<option value="已截止">已截止</option>-->
+                    <!--<option value="正在生效">正在生效</option>-->
+                <!--</select>-->
+                <!--&ndash;&gt;-->
+                <!--&lt;!&ndash;-->
+                <!--报价状态&nbsp;-->
+                <!--<select class="form-control select-adder" ng-model="status" ng-change="onSearch()" ng-init="status=200">-->
+                    <!--<option value="200">待报价</option>-->
+                    <!--<option value="201">已报价</option>-->
+                    <!--<option value="202">已采纳</option>-->
+                <!--</select>-->
+                <!--&ndash;&gt;-->
+            <!--</div>-->
+            <!--<div class="sreach fr">-->
+                <!--<span>发布时间&nbsp;</span>-->
+                <!--<div class="date fl">-->
+                    <!--<div class="data-input">-->
+                        <!--<input type="text" ng-model="startDate"-->
+                               <!--class="form-control select-adder" placeholder="起始时间"-->
+                               <!--datepicker-popup="yyyy-MM-dd"-->
+                               <!--is-open="condition.startDateOpen"-->
+                               <!--max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"-->
+                               <!--ng-click="openDatePicker($event, condition, 'startDateOpen',1)"-->
+                               <!--datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"-->
+                               <!--ng-change="vaildDate(true)"-->
+                        <!--/>-->
+                        <!--<button class="open" ng-click="openDatePicker($event, condition, 'startDateOpen')"></button>-->
+                    <!--</div>-->
+                    <!--<em>–</em>-->
+                    <!--<div class="data-input">-->
+                        <!--<input type="text" ng-model="endDate"-->
+                               <!--class="form-control select-adder" placeholder="结束时间"-->
+                               <!--datepicker-popup="yyyy-MM-dd"-->
+                               <!--is-open="condition.endDateOpen"-->
+                               <!--min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"-->
+                               <!--ng-click="openDatePicker($event, condition, 'endDateOpen',2)"-->
+                               <!--datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"-->
+                               <!--ng-change="changeEndDate()"-->
+                        <!--/>-->
+                        <!--<button class="open" ng-click="openDatePicker($event, condition, 'endDateOpen')"></button>-->
+                    <!--</div>-->
+                <!--</div>-->
+                <!--<div class="sreach-input fr">-->
+                    <!--<input type="search" placeholder="品牌/物料名称/型号/规格/公司" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>-->
+                    <!--<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
+        <div class="screen check-filter">
+            <div class="radio-block" style="display: none;">
+                求购筛选：
+                <label class="com-check-radio">
+                    <input type="radio" id="methodAll" name="method" ng-click="setFilters('vendorType', 'noOppor')" ng-checked="vendorType == 'noOppor'">
+                    <label for="methodAll"></label>
+                    全部
+                </label>
+                <label class="com-check-radio">
+                    <input type="radio" id="forSeller" name="method" ng-click="setFilters('vendorType', 'all')" ng-checked="vendorType == 'all'">
+                    <label for="forSeller"></label>
+                    公司商机
+                </label>
+                <label class="com-check-radio">
+                    <input type="radio" id="forPlatform" name="method" ng-click="setFilters('vendorType', 'self')" ng-checked="vendorType == 'self'">
+                    <label for="forPlatform"></label>
+                    我的商机
+                </label>
             </div>
-            <div class="sreach fr">
-                <span>发布时间&nbsp;</span>
-                <div class="date fl">
-                    <div class="data-input">
-                        <input type="text" ng-model="startDate"
-                               class="form-control select-adder" placeholder="起始时间"
-                               datepicker-popup="yyyy-MM-dd"
-                               is-open="condition.startDateOpen"
-                               max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
-                               ng-click="openDatePicker($event, condition, 'startDateOpen',1)"
-                               datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                               ng-change="vaildDate(true)"
-                        />
-                        <button class="open" ng-click="openDatePicker($event, condition, 'startDateOpen')"></button>
-                    </div>
-                    <em>–</em>
-                    <div class="data-input">
-                        <input type="text" ng-model="endDate"
-                               class="form-control select-adder" placeholder="结束时间"
-                               datepicker-popup="yyyy-MM-dd"
-                               is-open="condition.endDateOpen"
-                               min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
-                               ng-click="openDatePicker($event, condition, 'endDateOpen',2)"
-                               datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                               ng-change="changeEndDate()"
-                        />
-                        <button class="open" ng-click="openDatePicker($event, condition, 'endDateOpen')"></button>
-                    </div>
+            <div>
+                <div class="radio-block date-radio">
+                    发布时间：
+                    <label class="com-check-radio">
+                        <input type="radio" id="dateAll" name="date" ng-click="setFilters('dateArea', 'ALL')" ng-checked="dateArea == 'ALL'">
+                        <label for="dateAll"></label>
+                        全部
+                    </label>
+                    <label class="com-check-radio">
+                        <input type="radio" id="oneDay" name="date" ng-click="setFilters('dateArea', 'oneDay')" ng-checked="dateArea == 'oneDay'">
+                        <label for="oneDay"></label>
+                        近1天
+                    </label>
+                    <label class="com-check-radio">
+                        <input type="radio" id="threeDay" name="date" ng-click="setFilters('dateArea', 'threeDay')" ng-checked="dateArea == 'threeDay'">
+                        <label for="threeDay"></label>
+                        近3天
+                    </label>
+                    <label class="com-check-radio">
+                        <input type="radio" id="sevenDay" name="date" ng-click="setFilters('dateArea', 'sevenDay')" ng-checked="dateArea == 'sevenDay'">
+                        <label for="sevenDay"></label>
+                        近7天
+                    </label>
+                    <label class="com-check-radio">
+                        <input type="radio" id="autoDay" name="date" ng-click="setFilters('dateArea', 'autoDay')" ng-checked="dateArea == 'autoDay'">
+                        <label for="autoDay"></label>
+                        自定义
+                    </label>
                 </div>
-                <div class="sreach-input fr">
-                    <input type="search" placeholder="品牌/物料名称/型号/规格/公司" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
-                    <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+                <div class="sreach fr">
+                    <div class="date fl" ng-show="dateArea == 'autoDay'">
+                        <div class="data-input">
+                            <input id="start" type="text" ng-model="startDelivery" readonly="readonly"
+                                   class="form-control select-adder" placeholder="起始时间"
+                                   datepicker-popup="yyyy-MM-dd"
+                                   is-open="condition[0].open"
+                                   current-text="今天" clear-text="清除" close-text="关闭"
+                                   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                   ng-click="openDatePicker($event, condition, 0,1)"
+                                   ng-change="onDateCondition(1)"/>
+                            <button class="open" ng-click="openDatePicker($event, condition, 0)"></button>
+                        </div>
+                        <em>–</em>
+                        <div class="data-input">
+                            <input id="end" type="text" ng-model="endDelivery " readonly="readonly"
+                                   class="form-control select-adder" placeholder="结束时间"
+                                   datepicker-popup="yyyy-MM-dd"
+                                   is-open="condition[1].open"
+                                   current-text="今天" clear-text="清除" close-text="关闭"
+                                   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                   ng-click="openDatePicker($event, condition, 1, 2)"
+                                   ng-change="onDateCondition(2)"/>
+                            <button class="open" ng-click="openDatePicker($event, condition, 1)"></button>
+                        </div>
+                    </div>
+                    <div style="width:258px;float:left"></div>
                 </div>
             </div>
+          <div>
+              <div class="radio-block date-radio">
+                  求购时间：
+                  <label class="com-check-radio">
+                      <input type="radio" id="dateAllSeek" name="dateSeek" ng-click="setFilters('dateAreaSeek', 'ALL')" ng-checked="dateAreaSeek == 'ALL'">
+                      <label for="dateAllSeek"></label>
+                      全部
+                  </label>
+                  <label class="com-check-radio">
+                      <input type="radio" id="oneDaySeek" name="dateSeek" ng-click="setFilters('dateAreaSeek', 'oneDay')" ng-checked="dateAreaSeek == 'oneDay'">
+                      <label for="oneDaySeek"></label>
+                      近1天
+                  </label>
+                  <label class="com-check-radio">
+                      <input type="radio" id="threeDaySeek" name="dateSeek" ng-click="setFilters('dateAreaSeek', 'threeDay')" ng-checked="dateAreaSeek == 'threeDay'">
+                      <label for="threeDaySeek"></label>
+                      近3天
+                  </label>
+                  <label class="com-check-radio">
+                      <input type="radio" id="sevenDaySeek" name="dateSeek" ng-click="setFilters('dateAreaSeek', 'sevenDay')" ng-checked="dateAreaSeek == 'sevenDay'">
+                      <label for="sevenDaySeek"></label>
+                      近7天
+                  </label>
+                  <label class="com-check-radio">
+                      <input type="radio" id="autoDaySeek" name="dateSeek" ng-click="setFilters('dateAreaSeek', 'autoDay')" ng-checked="dateAreaSeek == 'autoDay'">
+                      <label for="autoDaySeek"></label>
+                      自定义
+                  </label>
+              </div>
+              <div class="sreach fr">
+                  <div class="date fl" ng-show="dateAreaSeek == 'autoDay'">
+                      <div class="data-input">
+                          <input id="startSeek" type="text" ng-model="startDate" readonly="readonly"
+                                 class="form-control select-adder" placeholder="起始时间"
+                                 datepicker-popup="yyyy-MM-dd"
+                                 is-open="condition[0].open1"
+                                 current-text="今天" clear-text="清除" close-text="关闭"
+                                 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                 ng-click="openDatePickerSeek($event, condition, 0,1)"
+                                 ng-change="onDateConditionSeek(1)"/>
+                          <button class="open" ng-click="openDatePickerSeek($event, condition, 0)"></button>
+                      </div>
+
+                      <em>–</em>
+                      <div class="data-input">
+                          <input id="endSeek" type="text" ng-model="endDate" readonly="readonly"
+                                 class="form-control select-adder" placeholder="结束时间"
+                                 datepicker-popup="yyyy-MM-dd"
+                                 is-open="condition[1].open1"
+                                 current-text="今天" clear-text="清除" close-text="关闭"
+                                 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                 ng-click="openDatePickerSeek($event, condition, 1, 2)"
+                                 ng-change="onDateConditionSeek(2)"/>
+                          <button class="open" ng-click="openDatePickerSeek($event, condition, 1)"></button>
+                      </div>
+                  </div>
+                  <div class="sreach-input fr">
+                      <input type="search" placeholder="品牌/物料名称/型号" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
+                      <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+                  </div>
+              </div>
+          </div>
         </div>
         <table ng-table="seekPurchaseTableParams">
             <thead>

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

@@ -9,10 +9,13 @@
     .seek-purchase .seek-purchase-content .screen {
         font-size: 14px;
         line-height: 32px;
+        clear: both;
+        background: #f5f8fe;
+        margin-bottom: 15px;
+        padding-top: 4px;
+        padding-right: 13px;
     }
-    .seek-purchase .seek-purchase-content .screen .fl {
-        margin-left: 14px;
-    }
+
     .seek-purchase .seek-purchase-content .screen .fl select{
         width: 88px;
         height: 32px;
@@ -32,11 +35,11 @@
     .seek-purchase .seek-purchase-content .screen .sreach input{
         border: #5078cb 1px solid;
         height: 32px;
-        width: 267px;
+        width: 200px;
         box-shadow: none;
     }
     .seek-purchase .seek-purchase-content .screen .sreach .date{
-        margin-right: 6px;
+        margin-right: 30px;
     }
     .seek-purchase .seek-purchase-content .screen .sreach .date input{
         width: 117px;
@@ -761,6 +764,36 @@
     .similar-list li:hover {
         background: #ddd;
     }
+
+    /*筛选按钮*/
+    .check-filter {
+        height: auto;
+        line-height: 30px;
+        padding-left: 22px;
+        margin-top: 0;
+    }
+    .check-filter .sreach input {
+        width: 147px;
+    }
+    .check-filter .radio-block {
+        display: inline-block;
+        font-size: 14px;
+        width: 33.3%;
+    }
+    .check-filter .radio-block.date-radio {
+        width: 45%;
+    }
+    .check-filter .radio-block .com-check-radio {
+        font-weight: normal;
+        color: #666;
+        margin-right: 13px;
+    }
+    .check-filter .radio-block .com-check-radio:last-child {
+        margin-right: 0;
+    }
+    label {
+        margin-bottom: 5px;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -788,66 +821,146 @@
     </div>
     <div class="seek-purchase-content">
         <!--搜索时间筛选-->
-        <div class="screen" style="background: #f5f8fe;height: 40px;margin-bottom: 15px;margin-top: 5px;padding-top: 4px;padding-right: 11px;">
-            <div class="fl">
-                <!--
-                截止时间&nbsp;
-                <select class="form-control select-adder" ng-model="deadline" ng-change="onSearch()" ng-init="deadline='全部'">
-                    <option value="全部">全部</option>
-                    <option value="已截止">已截止</option>
-                    <option value="正在生效">正在生效</option>
-                </select>
-                -->
-                <!--
-                报价状态&nbsp;
-                <select class="form-control select-adder" ng-model="status" ng-change="onSearch()" ng-init="status=200">
-                    <option value="200">待报价</option>
-                    <option value="201">已报价</option>
-                    <option value="202">已采纳</option>
-                </select>
-                -->
+        <div class="screen check-filter">
+            <div class="radio-block" style="display: block;">
+                求购筛选：
+                <label class="com-check-radio">
+                    <input type="radio" id="methodAll" name="method" ng-click="setFilters('vendorType', 'noOppor')" ng-checked="vendorType == 'noOppor'">
+                    <label for="methodAll"></label>
+                    全部
+                </label>
+                <label class="com-check-radio">
+                    <input type="radio" id="forSeller" name="method" ng-click="setFilters('vendorType', 'all')" ng-checked="vendorType == 'all'">
+                    <label for="forSeller"></label>
+                    公司商机
+                </label>
+                <label class="com-check-radio">
+                    <input type="radio" id="forPlatform" name="method" ng-click="setFilters('vendorType', 'self')" ng-checked="vendorType == 'self'">
+                    <label for="forPlatform"></label>
+                    我的商机
+                </label>
+            </div>
+            <div class="radio-block date-radio">
+                发布时间：
+                <label class="com-check-radio">
+                    <input type="radio" id="dateAll" name="date" ng-click="setFilters('dateArea', 'ALL')" ng-checked="dateArea == 'ALL'">
+                    <label for="dateAll"></label>
+                    全部
+                </label>
+                <label class="com-check-radio">
+                    <input type="radio" id="oneDay" name="date" ng-click="setFilters('dateArea', 'oneDay')" ng-checked="dateArea == 'oneDay'">
+                    <label for="oneDay"></label>
+                    近1天
+                </label>
+                <label class="com-check-radio">
+                    <input type="radio" id="threeDay" name="date" ng-click="setFilters('dateArea', 'threeDay')" ng-checked="dateArea == 'threeDay'">
+                    <label for="threeDay"></label>
+                    近3天
+                </label>
+                <label class="com-check-radio">
+                    <input type="radio" id="sevenDay" name="date" ng-click="setFilters('dateArea', 'sevenDay')" ng-checked="dateArea == 'sevenDay'">
+                    <label for="sevenDay"></label>
+                    近7天
+                </label>
+                <label class="com-check-radio">
+                    <input type="radio" id="autoDay" name="date" ng-click="setFilters('dateArea', 'autoDay')" ng-checked="dateArea == 'autoDay'">
+                    <label for="autoDay"></label>
+                    自定义
+                </label>
             </div>
             <div class="sreach fr">
-                <span>求购筛选</span>
-                <select class="form-control select-adder vendor-type" ng-model="vendorType" ng-change="onVendorTypeChange(vendorType)">
-                    <option value="all">公司商机</option>
-                    <option value="self">我的商机</option>
-                    <option value="noOppor">全部</option>
-                </select>
-                <span>发布时间&nbsp;</span>
-                <div class="date fl">
+                <div class="date fl" ng-show="dateArea == 'autoDay'">
                     <div class="data-input">
-                        <input type="text" ng-model="startDate"
+                        <input id="start" type="text" ng-model="startDate" readonly="readonly"
                                class="form-control select-adder" placeholder="起始时间"
                                datepicker-popup="yyyy-MM-dd"
-                               is-open="condition.startDateOpen"
-                               max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
-                               ng-click="openDatePicker($event, condition, 'startDateOpen',1)"
+                               is-open="condition[0].open"
+                               current-text="今天" clear-text="清除" close-text="关闭"
                                datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                               ng-change="vaildDate(true)"
-                        />
-                        <button class="open" ng-click="openDatePicker($event, condition, 'startDateOpen')"></button>
+                               ng-click="openDatePicker($event, condition, 0,1)"
+                               ng-change="onDateCondition(1)"/>
+                        <button class="open" ng-click="openDatePicker($event, condition, 0)"></button>
                     </div>
+
                     <em>–</em>
                     <div class="data-input">
-                        <input type="text" ng-model="endDate"
+                        <input id="end" type="text" ng-model="endDate" readonly="readonly"
                                class="form-control select-adder" placeholder="结束时间"
                                datepicker-popup="yyyy-MM-dd"
-                               is-open="condition.endDateOpen"
-                               min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
-                               ng-click="openDatePicker($event, condition, 'endDateOpen',2)"
+                               is-open="condition[1].open"
+                               current-text="今天" clear-text="清除" close-text="关闭"
                                datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                               ng-change="changeEndDate()"
-                        />
-                        <button class="open" ng-click="openDatePicker($event, condition, 'endDateOpen')"></button>
+                               ng-click="openDatePicker($event, condition, 1, 2)"
+                               ng-change="onDateCondition(2)"/>
+                        <button class="open" ng-click="openDatePicker($event, condition, 1)"></button>
                     </div>
                 </div>
                 <div class="sreach-input fr">
-                    <input type="search" placeholder="品牌/物料名称/型号/规格/公司" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
+                    <input type="search" placeholder="品牌/物料名称/型号" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
                     <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
                 </div>
             </div>
         </div>
+        <!--<div class="screen" style="background: #f5f8fe;height: 40px;margin-bottom: 15px;margin-top: 5px;padding-top: 4px;padding-right: 11px;">-->
+            <!--<div class="fl">-->
+                <!--&lt;!&ndash;-->
+                <!--截止时间&nbsp;-->
+                <!--<select class="form-control select-adder" ng-model="deadline" ng-change="onSearch()" ng-init="deadline='全部'">-->
+                    <!--<option value="全部">全部</option>-->
+                    <!--<option value="已截止">已截止</option>-->
+                    <!--<option value="正在生效">正在生效</option>-->
+                <!--</select>-->
+                <!--&ndash;&gt; -->
+                <!--&lt;!&ndash;-->
+                <!--报价状态&nbsp;-->
+                <!--<select class="form-control select-adder" ng-model="status" ng-change="onSearch()" ng-init="status=200">-->
+                    <!--<option value="200">待报价</option>-->
+                    <!--<option value="201">已报价</option>-->
+                    <!--<option value="202">已采纳</option>-->
+                <!--</select>-->
+                <!--&ndash;&gt;-->
+            <!--</div>-->
+            <!--&lt;!&ndash;<div class="sreach fr">&ndash;&gt;-->
+                <!--&lt;!&ndash;<span>求购筛选</span>&ndash;&gt;-->
+                <!--&lt;!&ndash;<select class="form-control select-adder vendor-type" ng-model="vendorType" ng-change="onVendorTypeChange(vendorType)">&ndash;&gt;-->
+                    <!--&lt;!&ndash;<option value="all">公司商机</option>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<option value="self">我的商机</option>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<option value="noOppor">全部</option>&ndash;&gt;-->
+                <!--&lt;!&ndash;</select>&ndash;&gt;-->
+                <!--&lt;!&ndash;<span>发布时间&nbsp;</span>&ndash;&gt;-->
+                <!--&lt;!&ndash;<div class="date fl">&ndash;&gt;-->
+                    <!--&lt;!&ndash;<div class="data-input">&ndash;&gt;-->
+                        <!--&lt;!&ndash;<input type="text" ng-model="startDate"&ndash;&gt;-->
+                               <!--&lt;!&ndash;class="form-control select-adder" placeholder="起始时间"&ndash;&gt;-->
+                               <!--&lt;!&ndash;datepicker-popup="yyyy-MM-dd"&ndash;&gt;-->
+                               <!--&lt;!&ndash;is-open="condition.startDateOpen"&ndash;&gt;-->
+                               <!--&lt;!&ndash;max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"&ndash;&gt;-->
+                               <!--&lt;!&ndash;ng-click="openDatePicker($event, condition, 'startDateOpen',1)"&ndash;&gt;-->
+                               <!--&lt;!&ndash;datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"&ndash;&gt;-->
+                               <!--&lt;!&ndash;ng-change="vaildDate(true)"&ndash;&gt;-->
+                        <!--&lt;!&ndash;/>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<button class="open" ng-click="openDatePicker($event, condition, 'startDateOpen')"></button>&ndash;&gt;-->
+                    <!--&lt;!&ndash;</div>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<em>–</em>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<div class="data-input">&ndash;&gt;-->
+                        <!--&lt;!&ndash;<input type="text" ng-model="endDate"&ndash;&gt;-->
+                               <!--&lt;!&ndash;class="form-control select-adder" placeholder="结束时间"&ndash;&gt;-->
+                               <!--&lt;!&ndash;datepicker-popup="yyyy-MM-dd"&ndash;&gt;-->
+                               <!--&lt;!&ndash;is-open="condition.endDateOpen"&ndash;&gt;-->
+                               <!--&lt;!&ndash;min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"&ndash;&gt;-->
+                               <!--&lt;!&ndash;ng-click="openDatePicker($event, condition, 'endDateOpen',2)"&ndash;&gt;-->
+                               <!--&lt;!&ndash;datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"&ndash;&gt;-->
+                               <!--&lt;!&ndash;ng-change="changeEndDate()"&ndash;&gt;-->
+                        <!--&lt;!&ndash;/>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<button class="open" ng-click="openDatePicker($event, condition, 'endDateOpen')"></button>&ndash;&gt;-->
+                    <!--&lt;!&ndash;</div>&ndash;&gt;-->
+                <!--&lt;!&ndash;</div>&ndash;&gt;-->
+                <!--&lt;!&ndash;<div class="sreach-input fr">&ndash;&gt;-->
+                    <!--&lt;!&ndash;<input type="search" placeholder="品牌/物料名称/型号/规格/公司" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>&ndash;&gt;-->
+                <!--&lt;!&ndash;</div>&ndash;&gt;-->
+            <!--&lt;!&ndash;</div>&ndash;&gt;-->
+        <!--</div>-->
         <table ng-table="seekPurchaseTableParams">
             <thead>
                 <tr>