买家中心增加入库

src/main/webapp/resources/js/usercenter/app.js

@@ -467,7 +467,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
             controller : 'buyer_materialCtrl'
         })).state('buyer_storage', angularAMD.route({
             title : '物料资料产品管理入库部分',
-            url : '/buyer_storage',
+            url : '/buyer_storage?type&ids',
             templateUrl : 'static/view/usercenter/forstore/buyer_storage.html',
             controllerUrl : "app/controllers/forstore/buyer_storageCtrl",
             controller : 'buyer_storageCtrl'

src/main/webapp/resources/js/usercenter/controllers/b2b/sale_badIn.js

@@ -208,6 +208,12 @@ define(['app/app'], function (app) {
         condition.dateTo = null;
       }
     };
+      // 展开收起
+      $scope.unfoldClick = function (data, type) {
+          angular.forEach(data, function(key) {
+              type.id !== key.id ? key.seleted = false : key.seleted = true;
+          })
+      };
   }]);
 
 

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

@@ -4027,7 +4027,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         toaster.pop('warning', '提示', '请先选择要入库的物料');
         return
       }
-      window.open('vendor#/vendor_storage?storage_tab=inBound&ids=' + ids, '_top')
+      window.open('user#/buyer_storage?type=1&ids=' + ids, '_top')
     }
     //  出库
     $scope.sendGoodsOut= function() {
@@ -4037,7 +4037,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         toaster.pop('warning', '提示', '请先选择要出库的物料');
         return
       }
-      window.open('vendor#/vendor_storage?storage_tab=outBound&ids=' + ids, '_top')
+      window.open('vendor#/vendor_storage?type=1&ids=' + ids, '_top')
     }
     // 物料修改确认按钮
     $scope.updateMaterialSave = function () {

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

@@ -1,6 +1,7 @@
 define([ 'app/app' ], function(app) {
     'use strict';
-    app.register.controller('buyer_storageCtrl', ['$location', '$scope', '$rootScope', '$stateParams', 'BaseService', 'Goods', 'KdnLogistics', '$modal', 'toaster', 'Loading', 'AuthenticationService', '$q', '$upload', '$http', 'ngTableParams', 'InvoiceFPurchase', 'ShippingAddress', 'Enterprise', function ($location, $scope, $rootScope, $stateParams, BaseService, Goods, KdnLogistics, $modal, toaster, Loading, AuthenticationService, $q, $upload, $http, ngTableParams, InvoiceFPurchase, ShippingAddress, Enterprise) {
+    app.register.controller('buyer_storageCtrl', ['$location', '$scope', '$rootScope', '$stateParams', 'BaseService', 'Goods', 'KdnLogistics', '$modal', 'toaster', 'Loading', 'AuthenticationService', '$q', '$upload', '$http', 'ngTableParams', 'InvoiceFPurchase', 'ShippingAddress', 'Enterprise',
+        function ($location, $scope, $rootScope, $stateParams, BaseService, Goods, KdnLogistics, $modal, toaster, Loading, AuthenticationService, $q, $upload, $http, ngTableParams, InvoiceFPurchase, ShippingAddress, Enterprise) {
         $rootScope.active = 'buyer_material';
         $scope.keyword = '';
         $scope.type = '';
@@ -20,7 +21,7 @@ define([ 'app/app' ], function(app) {
             {name: '查看出库记录', tab: 'outBound', id: 0},
             {name: '销售出库', tab: 'outBound', id: 2},
             {name: '其它出库', tab: 'outBound', id: 1}];
-        $scope.handleItem = $stateParams.type;
+        $scope.handleItem = $stateParams.type || 0;
 
         // 销售方式数据
         $scope.boundType = {
@@ -149,7 +150,6 @@ define([ 'app/app' ], function(app) {
             }
             initOtherData();
             clearRecordParams();
-            // window.location.href = '#/vendor_storage?type=' + type
         };
         // 销售方式筛选
         $scope.changeSupportType = function (type) {

src/main/webapp/resources/js/vendor/app.js

@@ -552,7 +552,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
             controller : 'vendor_onSaleCtrl'
         })).state('vendor_storage', angularAMD.route({
             title : '出入库',
-            url : '/vendor_storage?storage_tab&ids',
+            url : '/vendor_storage?type&ids',
             templateUrl : 'static/view/vendor/forstore/vendor_storage.html',
             controllerUrl : "app/controllers/forstore/vendor_storageCtrl",
             controller : 'vendor_storageCtrl'

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

@@ -4025,7 +4025,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         toaster.pop('warning', '提示', '请先选择要入库的物料');
         return
       }
-      window.open('vendor#/vendor_storage?storage_tab=inBound&ids=' + ids, '_top')
+      window.open('user#/buyer_storage?type=1&ids=' + ids, '_top')
     }
     //  出库
     $scope.sendGoodsOut= function() {
@@ -4035,7 +4035,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         toaster.pop('warning', '提示', '请先选择要出库的物料');
         return
       }
-      window.open('vendor#/vendor_storage?storage_tab=outBound&ids=' + ids, '_top')
+      window.open('vendor#/vendor_storage?type=1&ids=' + ids, '_top')
     }
     // 物料修改确认按钮
     $scope.updateMaterialSave = function () {

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

@@ -4154,7 +4154,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         toaster.pop('warning', '提示', '请先选择要入库的物料');
         return
       }
-      window.open('vendor#/vendor_storage?storage_tab=inBound&ids=' + ids, '_top')
+      window.open('user#/buyer_storage?type=1&ids=' + ids, '_top')
     }
     //  出库
     $scope.sendGoodsOut= function() {
@@ -4164,7 +4164,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         toaster.pop('warning', '提示', '请先选择要出库的物料');
         return
       }
-      window.open('vendor#/vendor_storage?storage_tab=outBound&ids=' + ids, '_top')
+      window.open('vendor#/vendor_storage?type=1&ids=' + ids, '_top')
     }
     // 物料修改确认按钮
     $scope.updateMaterialSave = function () {

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

@@ -20,7 +20,7 @@ define([ 'app/app' ], function(app) {
             {name: '查看出库记录', tab: 'outBound', id: 0},
             {name: '销售出库', tab: 'outBound', id: 2},
             {name: '其它出库', tab: 'outBound', id: 1}];
-        $scope.handleItem = $stateParams.type;
+        $scope.handleItem = $stateParams.type || 0;
 
         // 销售方式数据
         $scope.boundType = {
@@ -149,8 +149,6 @@ define([ 'app/app' ], function(app) {
             }
             initOtherData();
             clearRecordParams();
-
-            window.location.href = '#/vendor_storage?type=' + type
         };
         // 销售方式筛选
         $scope.changeSupportType = function (type) {

src/main/webapp/resources/view/usercenter/b2b/sale_badIn.html

@@ -319,149 +319,159 @@
         <!--ng-click="toggleType(item.id)"></li>-->
       </ul>
     </div>
-    <div class="radio-block" ng-if="handleItem !== 1" style="margin-top: 20px">
-      筛选：
-      <label class="com-check-radio">
-        <input type="radio" id="oneMonth" name="date" ng-click="setFilters('dateArea', 'oneMonth')" ng-checked="dateArea == 'oneMonth'">
-        <label for="oneMonth"></label>
-        30天
-      </label>
-      <label class="com-check-radio">
-        <input type="radio" id="threeMonth" name="date" ng-click="setFilters('dateArea', 'threeMonth')" ng-checked="dateArea == 'threeMonth'">
-        <label for="threeMonth"></label>
-        60天
-      </label>
-      <label class="com-check-radio">
-        <input type="radio" id="sixMonth" name="date" ng-click="setFilters('dateArea', 'sixMonth')" ng-checked="dateArea == 'sixMonth'">
-        <label for="sixMonth"></label>
-        180天
-      </label>
-      <label class="com-check-radio">
-        <input type="radio" id="autoMonth" name="date" ng-click="setFilters('dateArea', 'autoMonth')" ng-checked="dateArea == 'autoMonth'">
-        <label for="autoMonth"></label>
-        自定义
-      </label>
-      <div class="radio-date" ng-show="dateArea === 'autoMonth'">
-        <div class="data-input">
-          <input id="start" type="text" ng-model="startDate" 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, startDate, endDate)"/>
-          <button class="open" ng-click="openDatePicker($event, condition, 0)"></button>
-        </div>
+    <div class="screen check-filter">
+      <div class="radio-block date-radio">
+        筛选：
+        <label class="com-check-radio">
+          <input type="radio" id="oneMonth" name="date" ng-click="autoMonth = false;changeDateZone(1);condition.$open=false" checked>
+          <label for="oneMonth"></label>
+          30天
+        </label>
+        <label class="com-check-radio">
+          <input type="radio" id="threeMonth" name="date" ng-click="autoMonth = false;changeDateZone(3);condition.$open=false">
+          <label for="threeMonth"></label>
+          90天
+        </label>
+        <label class="com-check-radio">
+          <input type="radio" id="sixMonth" name="date" ng-click="autoMonth = false;changeDateZone(6);condition.$open=false">
+          <label for="sixMonth"></label>
+          180天
+        </label>
+        <label class="com-check-radio">
+          <input type="radio" id="autoMonth" name="date" ng-click="autoMonth = true;condition.$open=!condition.$open;changeDateZone(-1)">
+          <label for="autoMonth"></label>
+          自定义
+        </label>
+      </div>
+      <div class="sreach fr">
+        <div ng-show="autoMonth" class="date fl">
+          <div class="data-input">
+            <input type="text" ng-model="condition.dateFrom"
+                   class="form-control select-adder" placeholder="起始时间"
+                   datepicker-popup="yyyy-MM-dd"
+                   is-open="condition.$fromOpened"
+                   max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
+                   ng-click="openFilterDatePicker($event, condition, '$fromOpened')"
+                   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
+                   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+            />
+            <button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
+          </div>
 
-        <em>–</em>
-        <div class="data-input">
-          <input id="end" type="text" ng-model="endDate" 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, startDate, endDate)"/>
-          <button class="open" ng-click="openDatePicker($event, condition, 1)"></button>
+          <em>–</em>
+          <div class="data-input">
+            <input type="text" ng-model="condition.dateTo"
+                   class="form-control select-adder" placeholder="结束时间"
+                   datepicker-popup="yyyy-MM-dd"
+                   is-open="condition.$toOpened"
+                   min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
+                   ng-click="openFilterDatePicker($event, condition, '$toOpened')"
+                   ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
+                   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+            />
+            <button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
+          </div>
+        </div>
+        <div class="sreach-input fr">
+          <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+          <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
         </div>
-      </div>
-      <div class="search fr check" ng-if="handleItem !== 1">
-        <input type="text" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="{{storage_tab =='outBound' ? ( handleItem === 0 ? '出库单号/买家名称':'订单号/买家名称') : ( handleItem === 0 ? '入库单号/卖家名称':'发货单/卖家名称')}}"/>
-        <button ng-click="onSearch(keyword)" style="float: left;">搜索</button>
       </div>
     </div>
   </div>
   <table class="order-table block" ng-table="tableParams">
     <thead>
     <tr class="header">
-      <th>产品</th>
-      <th width="120">单价</th>
-      <th width="100">入库数量</th>
-      <th width="120">批号</th>
-      <th width="140">单据信息</th>
-      <th width="70">操作</th>
+      <th width="175">日期</th>
+      <th width="255">客户</th>
+      <th width="200">流水号</th>
+      <th width="210">送货单号</th>
+      <th>操作</th>
     </tr>
-    <!--<tr class="sep-row">-->
-      <!--<td colspan="6"></td>-->
-    <!--</tr>-->
     </thead>
-    <tbody ng-repeat="badIn in $data">
-    <tr class="order-hd">
-      <td class="first" colspan="3">
-        <div class="order-main">
-          <!--<span> <input type="checkbox" class="selector"
-            ng-model="badIn.$selected">
-          </span> -->
-          <span class="text-num text-bold" title="{{::badIn.date | date: 'yyyy年MM月dd日'}}">
-            日期：{{::badIn.date | date: 'yyyy年MM月dd日'}}
-          </span>
-          <span title="客户名称">
-             <img src="static/img/user/images/shop_home.png" style="margin-right: 5px;">{{::badIn.badInItems[0].orderItem.order.enterprise.enName}}
-          </span>
-          <span>流水号：<span
-              class="text-num" ng-bind="::badIn.code"></span></span>
-        </div>
+    <tbody ng-repeat="badIn in $data" ng-class="{'toggle-mode': badIn.seleted}" class="outBody">
+    <tr class="outTr">
+      <td class="text-num" title="{{::badIn.date | date: 'yyyy年MM月dd日 hh:mm'}}" >
+        {{::badIn.date | date:'yyyy年MM月dd日   '}}
       </td>
-      <td colspan="2" class="order-sum">
-        <div class="text-ellipsis" ng-if="badIn.sendCode != null" style="width: 240px;" title="送货单号：{{::badIn.sendCode}}" >
-          <i style="color: #CC9933;" class="fa fa-truck"></i>
-          <span ng-bind="badIn.sendCode"></span>
-        </div>
-      </td>
-      <td colspan="1" class="text-center">
-        <div class="operates">
-          <!-- <a href="#" class="text-muted" title="打印">
-            <i class="fa fa-print fa-lg fa-fw"></i>
-          </a> -->
-        </div>
-      </td>
-    </tr>
-    <tr class="order-bd" ng-repeat="item in badIn.badInItems">
-      <td class="product" style="text-align: left">
-        <div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}" title="第{{$index + 1}}行">{{$index + 1}}</div>
-        <div class="text-num text-bold">
-          <span title="{{::item.orderItem.product.code}}" >
-            物料编号：{{::item.orderItem.product.code|| '-'}}
-          </span>
-        </div>
-        <div>
-          <span title="{{::item.orderItem.product.title}}" style="color: #666 !important;">
-            物料名称：{{::item.orderItem.product.title|| '-'}}
-          </span>
-        </div>
-        <div class="text-muted" title="{{::item.orderItem.product.spec}}" style="color: #666 !important;">
-          物料规格：{{::item.orderItem.product.spec|| '-'}}
-        </div>
+      <td title="{{::badIn.badInItems[0].orderItem.order.enterprise.enName}}">
+        {{::badIn.badInItems[0].orderItem.order.enterprise.enName}}
       </td>
-      <td>
-        <div ng-if="!isUser" class="text-num" title="{{item.orderPrice}}">
-          <span ng-bind="::badIn.currency"></span>
-          <span ng-bind="::item.orderPrice"></span>
-        </div>
-        <div class="text-muted"
-             title="{{item.orderItem.taxrate}}%">
-          <br>
-          税率：<span ng-bind="::item.orderItem.taxrate + '%'" class="text-num"></span>
-        </div>
+      <td title="{{::badIn.code}}"  class="text-num">
+        {{::badIn.code}}
       </td>
-      <td class="text-center">
-        <div class="text-num text-bold"
-             title="{{::item.qty}}" ng-bind="::item.qty"></div>
-        <div class="text-muted" ng-bind="::item.orderItem.product.unit"></div>
+      <td title="{{badIn.sendCode}}">
+        {{badIn.sendCode}}
       </td>
-      <td class="text-center br-l">
-        <div class="text-num"
-             ng-bind="::item.batchCode"></div>
+      <td style="cursor: pointer;">
+        <span class="btn-toggle" ng-show="badIn.seleted" ng-click="badIn.seleted = !badIn.seleted">收起 <i class="fa fa-angle-up"></i></span>
+        <span ng-click="unfoldClick($data,badIn)" class="btn-toggle" ng-show="!badIn.seleted">展开 <i class="fa fa-angle-down"></i></span>
       </td>
-      <td class="br-l" colspan="2">
-        <div>单据编号：<a style="color: #5078cb;" title="查看对应采购单详情"  ui-sref="sale_order_detail({id:item.orderItem.order.id})" ng-bind="::item.orderItem.order.code"></a></div>
-        <div>
-          第 <span ng-bind="::item.orderItem.number"></span> 行
-          &nbsp;&nbsp;&nbsp;&nbsp;数量：<span ng-bind="::item.orderItem.qty"></span>
+
+    <tr ng-if="badIn.seleted">
+      <td colspan="5">
+        <div class="sub-table-head">
+          <table class="wanted-sub-tab table">
+            <thead>
+            <tr>
+              <th width="60">序号</th>
+              <th width="406">产品</th>
+              <th width="120">单价</th>
+              <th width="100">出库数量</th>
+              <th width="120">批号</th>
+              <th width="230">单据信息</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr  ng-repeat="item in badIn.badInItems">
+              <td style="font-size: 14px;text-align: center">
+                {{$index + 1}}
+              </td>
+              <td class="product" style="text-align: left">
+                <div class="text-num" title="{{::item.orderItem.product.code}}">
+                      <span style="color: #333">
+                        物料编号：{{::item.orderItem.product.code || '-'}}
+                      </span>
+                </div>
+                <div title="{{::item.orderItem.product.title}}">
+                      <span style="color: #333">
+                        物料名称：{{::item.orderItem.product.title || '-'}}
+                      </span>
+                </div>
+                <div style="color: #333 !important;" class="text-muted" title="{{::item.orderItem.product.spec}}" >
+                  物料规格：{{::item.orderItem.product.spec || '-'}}
+                </div>
+              </td>
+              <td>
+                <div class="text-num" title="{{::item.orderPrice}}">
+                  <span ng-if="!isUser" ng-bind="::badIn.currency"></span>
+                  <span ng-if="!isUser" ng-bind="::item.orderPrice"></span>
+                  <span ng-if="isUser">-</span>
+                </div>
+                <div class="text-num" title="{{item.orderItem.taxrate}}%">
+                  税率：<span ng-bind="::item.orderItem.taxrate + '%'" class="text-num"></span>
+                </div>
+              </td>
+              <td class="text-center">
+                <div class="text-num"
+                     title="{{::item.qty}}" ng-bind="::item.qty"></div>
+                <div class="text-num" ng-bind="::item.orderItem.product.unit"></div>
+              </td>
+              <td class="text-center br-l">
+                <div class="text-num"
+                     ng-bind="::item.batchCode"></div>
+              </td>
+              <td class="br-l" colspan="2">
+                <div>单据编号：<a style="color: #5078cb;" title="查看对应采购单详情" ng-href="vendor#/order/{{item.orderItem.order.id}}" ng-bind="::item.orderItem.order.code"></a></div>
+                <div>
+                  第 <span ng-bind="::item.orderItem.number"></span> 行
+                  &nbsp;&nbsp;&nbsp;&nbsp;数量：<span ng-bind="::item.orderItem.qty"></span>
+                </div>
+              </td>
+            </tr>
+            </tbody>
+          </table>
         </div>
-      </td>
     </tr>
     </tbody>
     <tbody ng-if="$data.length === 0">
@@ -484,4 +494,166 @@
   <div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
     显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
   </div>
-</div>
+</div>
+<style>
+  .order-table .header>th {
+    height: 50px;
+  }
+  .toggle-mode {
+    border-color: #3f84f6 !important;
+    border-width: 2px !important;
+  }
+  .order-table tbody.outBody tr.outTr td {
+    padding: 0 5px;
+    line-height: 50px;
+    height: 50px;
+    vertical-align: middle;
+    text-align: center;
+    font-size: 14px;
+    border-bottom: 1px solid #e9e9e9;
+    white-space: nowrap;
+  }
+  .table>thead>tr>th {
+    vertical-align: middle;
+    font-size: 14px;
+    color: #323232;
+
+  }
+  .order-table tbody.toggle-mode >tr:first-child {
+    background: #f5f5f5;
+  }
+  .order-table tbody>tr>td span {
+    vertical-align: middle;
+    width: 100%;
+    /*display: inline-block;*/
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .order-table .btn-toggle {
+    text-align: center;
+    font-size: 14px;
+    color: #5078cb;
+    cursor: pointer;
+  }
+  /*search部分*/
+  .search-check{
+    padding: 15px 20px 5px;
+    height:auto;
+  }
+
+  .search-check .search .form-control{
+    width: 300px;
+    float: left;
+    height: 34px;
+    border-radius: 2px;
+    box-shadow: none;
+    border:1px solid #5078cb;
+  }
+
+  .search-check .search button{
+    background: #5078cb;
+    border: #5078cb 1px solid;
+    border-left: none;
+    color: #fff;
+    border-radius: 2px;
+  }
+
+  .search-check .radio-block {
+    line-height: 36px;
+    margin-bottom:10px;
+    font-size: 14px;
+  }
+  .search-check .radio-block .radio-btn{
+    display:inline-block;
+    position: relative;
+    top: 2px;
+  }
+  .search-check .radio-block .radio-btn li{
+    margin: 0 3px;
+    font-size: 14px;
+    line-height: 34px;
+    padding:0 10px;
+    height:34px;
+    border:1px solid #bfbfbf;
+    border-radius:3px;
+    cursor:pointer;
+  }
+  .search-check .radio-block .radio-btn li a{
+    color: #323232
+  }
+  .search-check .radio-block .radio-btn li:hover {
+    border:1px solid #5078cb;
+    color:#5078cb;
+  }
+  .search-check .radio-block .radio-btn li:hover a{
+    color:#5078cb;
+  }
+  .search-check .radio-block .radio-btn li.active{
+    border:1px solid #5078cb;
+    color:#5078cb;
+  }
+  .search-check .radio-block .radio-date{
+    display:inline-block;
+    vertical-align: middle;
+  }
+  .search-check .radio-block .radio-date .btn-default{
+    border: none;
+  }
+  .search-check .radio-block .radio-date .data-input{
+    float:left;
+    position:relative;
+  }
+  .search-check .radio-block .radio-date .data-input input{
+    width:120px;
+  }
+  .search-check .radio-block .radio-date .data-input button.open {
+    position: absolute;
+    right: 2px;
+    top: 2px;
+    width: 20px;
+    height: 30px;
+    background: url(static/img/user/images/xiala.png) right no-repeat #fff !important;
+    background-position-x: 100% !important;
+    border: none;
+  }
+  .search-check .radio-block .radio-date > em{
+    float: left;
+    line-height: 32px;
+    color: #999;
+    margin: 0 5px;
+  }
+  .search-check .radio-block .com-check-radio {
+    font-weight: normal;
+    color: #666;
+    margin-right: 13px;
+    cursor:pointer;
+  }
+  .search-check .radio-block .com-check-radio label {
+    margin-bottom:6px;
+  }
+  .screen {
+    padding-left: 0px;
+    background: #fff;
+    padding-top: 10px;
+    padding-right: 11px;
+    line-height: 32px;
+  }
+  .screen .sreach input {
+    border: #5078cb 1px solid;
+    height: 32px;
+    width: 330px;
+    box-shadow: none;
+  }
+  .screen .sreach a.seek {
+    width: 58px;
+    height: 32px;
+    background: #5078cb;
+    color: #fff;
+    line-height: 32px;
+    float: none;
+    border-radius: 2px;
+    vertical-align: unset;
+  }
+
+</style>

src/main/webapp/resources/view/vendor/b2b/sale/sale_badOut.html

@@ -326,7 +326,6 @@
         <!--ng-if="item.tab === storage_tab"-->
         <!--ng-click="toggleType(item.id)"></li>-->
       </ul>
-
     </div>
     <div class="screen check-filter">
       <div class="radio-block date-radio">
@@ -387,7 +386,6 @@
         </div>
       </div>
     </div>
-
   </div>
   <table class="order-table block" ng-table="tableParams">
     <thead>
@@ -501,8 +499,6 @@
      </tr>
     </tbody>
   </table>
-
-
   <div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
     显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
   </div>