出入库页面样式

src/main/webapp/resources/js/common/services.js

@@ -875,9 +875,6 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
 		}
 
 		return function (num, fractionSize) {
-			if(num == 1) {
-				console.log(1);
-			}
 			//判断是否是数字，如果不是这返回。
 			if(typeof num !== 'number') {
 				return num;

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

@@ -7,6 +7,26 @@ define([ 'app/app' ], function(app) {
         $scope.isInt = /^[0-9]*[1-9][0-9]*$/;
         document.title = '卖家出入库-优软商城';
         $scope.storage_tab = 'inPut';
+
+        // 更多操作数据和记录
+        $scope.handleLink = [
+            {name: '查看入库记录', tab: 'inPut', id: 0},
+            {name: '其它入库', tab: 'inPut', id: 1},
+            {name: '采购入库', tab: 'inPut', id: 2},
+            {name: '查看出库记录', tab: 'outPut', id: 0},
+            {name: '其它出库', tab: 'outPut', id: 1},
+            {name: '销售出库', tab: 'outPut', id: 2}];
+        // $scope.handleItem = $scope.storage_tab === 'inPut'? $scope.handleLink[0].id : $scope.handleLink[3].id;
+        $scope.handleItem = 1;
+
+
+        $scope.lockData = [
+            {seleted: false, maiName: '324134', selfSupport: '腌肉入库', uuid: '张三1', date: 340325435434535, content: [{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'}]},
+            {seleted: false, maiName: '324134', selfSupport: '腌肉入库', uuid: '张三2', date: 34032545354325432, content: [{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'}]},
+            {seleted: false, maiName: '324134', selfSupport: '腌肉入库', uuid: '张三3', date: 340324535454325432, content: [{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'}]},
+            {seleted: false, maiName: '324134', selfSupport: '腌肉入库', uuid: '张三4', date: 340323554325432, content: [{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'},{code: 'w324', code1: '342', code2: '2144'}]}
+        ];
+
         //数字的正则表达式
         var intPattern = /^[1-9]+$/;
 
@@ -15,6 +35,7 @@ define([ 'app/app' ], function(app) {
 
         //只包含中文和英文的字符
         var pattern = /^[\u4e00-\u9fa5a-zA-Z]+$/;
+
         $scope.param = {
             page : 1,
             count : 10,
@@ -38,17 +59,135 @@ define([ 'app/app' ], function(app) {
         // 商品分页数据
         $scope.goodsPageParams = {};
         $scope.selfSupportType = {
-            ALL: '销售方式',
-            SELF_SUPPORT: '自营',
-            CONSIGNMENT: '寄售'
+            ALL: '全部类型',
+            SELF_SUPPORT: '其它入库',
+            CONSIGNMENT: '采购入库'
         };
+
+        // 时间域选择
+        $scope.dateArea = 'All'
+
         $scope.selfSupport = $scope.selfSupportType.ALL;
 
         $scope.onsale = {};
 
+        // 清空数据
+        var clearRecordParams = function () {
+            $scope.dateArea = 'All'
+            $scope.keyword = null;
+            $scope.startDate = null;
+            $scope.endDate = null;
+        };
+
         //出入库切换
         $scope.toggleStorage = function (type) {
             $scope.storage_tab = type
+        };
+
+
+        // 操作类型切换
+        $scope.toggleType = function (type) {
+            $scope.handleItem = type.id;
+            clearRecordParams()
+        };
+
+        // 时间格式化
+        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() + 4) / 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 === 'autoMonth') {
+                    $scope.startDate = null;
+                    $scope.endDate = null;
+                } else if (val === 'oneMonth') {
+                    $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);
+                    $scope.endDate = endDate;
+                } else if (val === 'sixMonth') {
+                    $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000);
+                    $scope.endDate = endDate;
+                } else {
+                    $scope.startDate = null;
+                    $scope.endDate = null;
+                }
+            }
+        };
+
+        // 初始化时间变量
+        $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.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+          }
+        };
+
+        $scope.onFocus = function (e) {
+            console.log(e.target)
         }
 
         //获取币别信息

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

@@ -1014,8 +1014,8 @@
 		<div class="com_tab" style="margin-bottom: 10px">
 			<ul class="fl" style="width: 100%">
 				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">产品库</a></li>
-				<li><a>出入库</a></li>
-				<li><a ui-sref="vendor_undercarriage">上下架记录</a></li>
+				<li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>
+				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架记录</a></li>
 			</ul>
 		</div>
 		<div class="com_tab com_tab2" ng-if="!isPcbStore" style="margin-bottom: 0px">

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

@@ -1,45 +1,10 @@
 <!--右侧主体部分-->
 <style>
-    .tab.active {
-        display: inline-block !important;
-    }
     *{-webkit-box-sizing: border-box;  -moz-box-sizing: border-box;  box-sizing: border-box;}
-    div.wanted_list01 dt.paging-bar>span {
-        float: right;
-        width: 322px;
-        height: 40px;
-        font-weight: normal;
-    }
-    div.wanted_list01 dt.paging-bar>span button.paging-button {
-        padding: 0;
-        height: 40px;
-        line-height: 40px;
-        border: none;
-        background: #FFFFFF;
-    }
-    div.wanted_list01 dt.paging-bar>span button.paging-button:hover {
-        color: #0C3894;
-    }
-    div.wanted_list01 dt.paging-bar>span input.page-num {
-        width: 25px;
-        height: 25px;
-        line-height: 40px;
-        border: 1px #C7BEBE solid;
-        text-align: center;
-    }
     label[disabled] {
         cursor: not-allowed;
     }
 
-    .materrial-list span.length01{
-        width: 10% !important;
-    }
-    .materrial-list span{
-        width: 20% !important;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
     ul.pagination.ng-table-pagination > li > a > span {
         height: 17px;
         line-height: 17px;
@@ -106,7 +71,7 @@
         border-top: none;
         display: none;
         left: 0;
-        top: 40px;
+        top: 100%;
     }
     .filter .hover-show a{
         width: 100%;
@@ -244,7 +209,7 @@
         /* margin-top: 5px; */
         padding-right: 22px
     }
-    .wanted_list01 .pagination{
+    .wanted_list .pagination{
         margin: 0;
     }
     .ng-table-pager{
@@ -545,118 +510,11 @@
     .fa-minus-circle{
         color: #faa002;
     }
-    /*表格鼠标悬停效果*/
-    .wanted_list01 .tab table tbody.edit-border:hover{
-        background: #c7ebfd;
-        z-index: 10;
-    }
-
-    /*非编辑状态自定义标签*/
-    /*.wanted_list01 .tab table tr.define:hover{*/
-    /*background: none;*/
-    /*}*/
-    .wanted_list01 .tab table tr.define{
-        width: 100%;
-        height: 20PX;
-        line-height: 20px;
-    }
-    .wanted_list01 .tab table tr.define td{
-        position: relative;
-        width: 100%;
-        height: 20PX;
-        line-height: 20px;
-        overflow: hidden;
-        border-bottom: none!important ;
-    }
-    .wanted_list01 .tab table tr.define td img.standard{
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 27px;
-        height: 27px;
-    }
-    .wanted_list01 .tab table tr.define td .code{
-        padding: 4px 0 0 43px;
-        float: left;
-        font-size:14px;
-        color: #333;
-    }
-    .wanted_list01 .tab table tr.define td .code span{
-        font-size:14px;
-        color: #333;
-    }
-    .wanted_list01 .tab table tr.define td .labelling{
-        float: left;
-        padding-top: 4px;
-        margin-left: 40px;
-        font-size: 14px;
-        color: #333;
-    }
-    .wanted_list01 .tab table tr.define td .labelling span{
-        padding: 0 10px;
-        width: 124px;
-        height: 19px;
-        font-size: 12px;
-        color: #5078cb;
-        border-radius: 9px;
-        border: 1px solid #5078cb ;
-        background: #fff;
-
-    }
-    .device .wanted_list01 span.edits{
-        display: inline-block;
-        width: 56px;
-        height: 24px;
-        line-height: 24px;
-        font-size: 12px;
-        color: #5078cb;
-        cursor: pointer;
-    }
-    .device .wanted_list01 span.edits:hover{
-        color: #fff;
-        background: #5078cb;
-    }
-    /*非编辑状态自定义标签*/
-    .wanted_list01 .tab table tr.defines{
-        background: #ebf5fe;
-    }
-    .wanted_list01 .tab table tr.defines td .labelling input{
-        padding-left: 10px;
-        width: 157px;
-        height: 24px;
-        border: 1px solid #c9c9c9;
-        background: #fff;
-        border-radius: 4px;
-    }
-    .wanted_list01 .tab table tr.define td .labelling em{
-        color: #f00;
-    }
-    .wanted_list01 .tab table tr.edit-forms{
-        background: #ebf5fe;
-        padding: 0 8px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td{
-        background: #fff;
-    }
 
     .edit-form td div span em.margin5{
         margin-left: 5px;
     }
-    /*编辑状态*/
-    .wanted_list01 .tab table tr.edit-forms td{
-        background: #ebf5fe;
-        padding: 0 10px 10px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show{
-        width: 100%;
-        height: 124px;
-        background: #fff;
-        overflow: hidden;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .content-show{
-        margin-top: 4px;
-        float: left;
-    }
+
     .content-show .select-item{
         width: 88px;
         height: 24px;
@@ -666,49 +524,6 @@
         border-radius: 3px;
         padding-left: 6px;
     }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width20{
-        width: 20px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width20 div{
-        height: 96px;
-        line-height: 96px;
-        padding-left: 3px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width200{
-        width: 235px;
-        margin-top: 10px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width200 .img{
-        margin-top: 10px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width120{
-        width: 110px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width130{
-        width: 145px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width135{
-        width: 110px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width130 div span:first-child{
-        width: 73px;
-        text-align: right;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width100{
-        width: 140px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width90{
-        width: 90px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width70{
-        width: 85px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width60{
-        width: 60px;
-    }
-    /*.wanted_list01 .tab table tbody.edit-border{*/
-    /*border: 1px solid #84c5fb;*/
-    /*}*/
     .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th{
         padding: 0 0 9px;
     }
@@ -748,40 +563,6 @@
         overflow-y: auto;
         overflow-x: hidden;
     }
-    .device .wanted_list01 a:hover {
-        border-bottom: 1px solid #ddd !important ;
-    }
-    .device .wanted_list01 a.page-a{
-        color: #fff !important ;
-    }
-
-    .wanted_list01 .tab table > tbody > tr.batch-tr {
-        height: 40px;
-        text-align: center;
-    }
-    .wanted_list01 .tab table > tbody > tr.batch-tr td {
-        border-bottom: none;
-    }
-    .wanted_list01 .tab table > tbody > tr.batch-tr.active {
-        position: fixed;
-        bottom: 0;
-        z-index: 2000;
-    }
-    .wanted_list01 .tab table > tbody > tr.batch-tr.active td {
-        width: 1029px;
-        border-top: 0;
-    }
-    .wanted_list01 .tab table > tbody > tr.batch-tr td {
-        padding: 0;
-        border-top: #dff3fd 1px solid;
-    }
-    .wanted_list01 .tab table>tbody>tr>td .batch-line {
-        width: 100%;
-        height: 40px;
-        background: #dff3fd;
-        line-height: 40px;
-        text-align: center;
-    }
     .com_tab ul li{
         margin-left: 0px;
         position: relative;
@@ -959,9 +740,6 @@
         cursor: pointer;
     }
 
-    .wanted_list01 .tab table tr {
-        height: 104px;
-    }
     .Regulpic img {
         width: 24px;
         height: 27px;
@@ -1019,7 +797,7 @@
     }
 
     .search-check .radio-block {
-        line-height: 34px;
+        line-height: 36px;
         margin-bottom:10px;
         font-size: 14px;
     }
@@ -1046,6 +824,9 @@
         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;
@@ -1083,6 +864,157 @@
         margin:0;
     }
 
+    .wanted_list .btn-click{
+        padding: 0 10px;
+        display: inline-block;
+        height: 28px;
+        line-height: 28px;
+        text-align: center;
+        font-size: 14px;
+        color: #666;
+        border:1px solid #bfbfbf;
+        margin: 0 10px;
+    }
+    .wanted_list .btn-click:hover{
+        color: #5078cb;
+        cursor: pointer;
+        border:1px solid #5078cb;
+    }
+    .wanted_list .btn-toggle{
+        text-align: center;
+        font-size: 14px;
+        color: #5078cb;
+        cursor: pointer;
+    }
+
+    .wanted_list .table_title span{
+        display:inline-block;
+        line-height: 46px;
+        height:46px;
+        text-align: center;
+        font-size: 14px;
+        color:#333;
+        font-weight: bold;
+        vertical-align: middle;
+    }
+    .wanted_list .table_title span input{
+        position: relative;
+        top: 5px;
+    }
+    .wanted_list .table_title span:nth-child(1){width:110px;}
+    .wanted_list .table_title span:nth-child(2){width:270px;}
+    .wanted_list .table_title span:nth-child(3){width:130px;}
+    .wanted_list .table_title span:nth-child(4){width:130px;}
+    .wanted_list .table_title span:nth-child(5){width:180px;}
+    .wanted_list .table_title span:nth-child(6){width:180px;}
+    .wanted_list .wanted-tab{
+        table-layout:fixed;
+        background: #fff;
+        font-size: 14px;
+        color:#333;
+    }
+    .wanted_list .wanted-tab caption{
+        font-size: 14px;
+        line-height: 50px;
+        height:50px;
+        background: #fff;
+        padding:0 0 0 15px;
+        color:#333;
+    }
+    .wanted_list .wanted-tab thead>tr>th{
+        padding:0;
+        margin:0;
+        border:0;
+        line-height: 46px;
+        height:46px;
+        text-align: center;
+        font-size: 14px;
+        border-bottom: 1px solid #e9e9e9;
+    }
+    .wanted_list .wanted-tab tbody>tr>td{
+        padding:0;
+        line-height: 50px;
+        height:50px;
+        vertical-align: middle;
+        text-align: center;
+        font-size: 14px;
+        border-bottom: 1px solid #e9e9e9;
+    }
+    .wanted_list .wanted-tab tbody>tr>td input{
+        width:90%;
+        margin: 0 auto;
+    }
+    .wanted_list .wanted-tab tbody>tr>td input.form-control[readonly]{
+        border: 0 !important;
+        background: none;
+        box-shadow: none;
+        padding:0;
+        margin:0;
+    }
+    .wanted_list .table>tbody+tbody {
+         border:none;
+    }
+    .wanted_list .wanted-tab tbody.toggle-mode{
+        border: 2px solid #5078cb;
+    }
+    .wanted_list .wanted-tab tbody.toggle-mode >tr:first-child{
+        background: #f5f5f5;
+    }
+    .down-form{
+        position:relative;
+    }
+    .down-form ul{
+        position:absolute;
+        top:100%;
+        width:700px;
+        max-height:360px;
+        overflow-y:hidden;
+        border:1px solid #5078cb;
+        border-radius:5px;
+        background: #fff;
+        box-shadow: 0 0 5px rgba(0,0,0,.8);
+        margin-left:5px;
+    }
+    .down-form ul li{
+        line-height: 34px;
+        height:34px;
+        font-size: 14px;
+        color:#333;
+        text-align: left;
+        vertical-align:middle;
+    }
+    .down-form ul li span{
+        display:inline-block;
+        padding: 0 10px;
+        vertical-align:middle;
+    }
+    .down-form ul li span:nth-child(1){width:20%;}
+    .down-form ul li span:nth-child(2){width:20%;}
+    .down-form ul li span:nth-child(3){width: 30%;}
+    .down-form ul li span:nth-child(4){
+        width:25%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    .wanted_list .wanted-sub-tab{
+        margin: 0 auto;
+        width: 98%;
+    }
+    .wanted_list .wanted-sub-tab caption{}
+    .wanted_list .wanted-sub-tab caption span{
+        float:right;
+        margin-right:20px;
+    }
+    .wanted_list .wanted-sub-tab thead{}
+    .wanted_list .wanted-sub-tab thead tr{}
+    .wanted_list .wanted-sub-tab thead tr th{
+        font-weight: normal;
+    }
+    .wanted_list .wanted-sub-tab tbody{}
+    .wanted_list .wanted-sub-tab tbody tr{}
+    .wanted_list .wanted-sub-tab tbody tr td{}
+
 
 </style>
 <div class="user_right fr">
@@ -1090,12 +1022,15 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>
-                <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
-                <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
+                <!--<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>-->
+                <!--<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>-->
+                <!--<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>-->
+                <!--<li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>-->
+                <!--<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>-->
+                <!--<li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>-->
+                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">产品库</a></li>
                 <li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>
-                <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
-                <li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>
+                <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架记录</a></li>
             </ul>
         </div>
         <div class="com_tab com_tab2" style="margin-bottom: 10px">
@@ -1105,10 +1040,10 @@
             </ul>
         </div>
         <div class="search-check">
-            <div class="radio-block">
+            <div class="radio-block" ng-if="handleItem !== 1">
                 更多筛选：
                 <label class="com-check-radio">
-                    <input type="radio" id="dateAll" name="date" ng-click="setFilters('dateArea', 'ALL')" ng-checked="dateArea == 'ALL'">
+                    <input type="radio" id="dateAll" name="date" ng-click="setFilters('dateArea', 'All')" ng-checked="dateArea == 'All'">
                     <label for="dateAll"></label>
                     全部
                 </label>
@@ -1152,11 +1087,13 @@
             <div class="radio-block">
                 更多操作：
                 <ul class="radio-btn list-inline">
-                    <li class="active">查看入库记录</li>
-                    <li>其它入库</li>
-                    <li>采购入库</li>
+                    <li ng-repeat="item in handleLink"
+                        ng-bind="item.name"
+                        ng-class="{'active': handleItem === item.id}"
+                        ng-if="item.tab === storage_tab"
+                        ng-click="toggleType(item)"></li>
                 </ul>
-                <div class="radio-date">
+                <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="起始时间"
@@ -1184,7 +1121,233 @@
                 </div>
             </div>
         </div>
-        <div class="wanted_list01">
+
+        <div class="wanted_list">
+            <table class="wanted-tab table">
+                <thead>
+                <tr>
+                    <th width="120" ng-bind="storage_tab === 'inPut' ? '入库单号' : '出库单号'"></th>
+                    <th width="180" ng-bind="storage_tab === 'inPut' ? '*发货单' : '*订单号'" ng-if="handleItem === 2"></th>
+                    <th width="180" ng-bind="storage_tab === 'inPut' ? '卖家名称' : '买家名称'"></th>
+                    <th class="filter" width="110">
+                        <a ng-bind="selfSupport">全部类型</a> <i class="fa fa-angle-down fa-angle-up"></i>
+                        <div class="hover-show">
+                            <a ng-click="changeSupportType(selfSupportType.ALL)">全部类型</a>
+                            <a ng-click="changeSupportType(selfSupportType.SELF_SUPPORT)" ng-bind="storage_tab === 'inPut' ? '其它入库' : '其它出库'"></a>
+                            <a ng-click="changeSupportType(selfSupportType.CONSIGNMENT)" ng-bind="storage_tab === 'inPut' ? '销售入库' : '销售出库'"></a>
+                        </div>
+                    </th>
+                   <th width="90">录入人</th>
+                    <th width="170">录入日期</th>
+                    <th width="170" class="padding0">操作</th>
+                </tr>
+                </thead>
+
+                <!--查看出入库-->
+                <tbody ng-if="handleItem === 0" ng-repeat="item in lockData" ng-class="{'toggle-mode': item.seleted}">
+                <tr>
+                    <td>系统自动生成</td>
+                    <td ng-bind="item.maiName">深圳有陵县什么 翁一搂的</td>
+                    <td ng-bind="item.selfSupport">腌肉入库</td>
+                    <td ng-bind="item.uuid">张三</td>
+                    <td ng-bind="item.date">2018-12-12 12：！@：</td>
+                    <td><span class="btn-toggle" ng-show="item.seleted" ng-click="item.seleted = !item.seleted">收起 <i class="fa fa-angle-up"></i></span><span ng-click="item.seleted = !item.seleted" class="btn-toggle" ng-show="!item.seleted">展开 <i class="fa fa-angle-down"></i></span></td>
+                </tr>
+                <tr ng-show="item.seleted">
+                    <td colspan="6">
+                        <div class="sub-table-head">
+                            <table class="wanted-sub-tab table">
+                                <caption>
+                                    明细列表：
+                                    <span>所属订单：1231243243243543534543</span>
+                                </caption>
+                                <thead>
+                                <tr>
+                                    <th width="60">序号</th>
+                                    <th width="110">型号</th>
+                                    <th width="130">品牌</th>
+                                    <th>物料名称</th>
+                                    <th width="210">规格</th>
+                                    <th width="130">数量(PCS)</th>
+                                    <th width="130">单价</th>
+                                </tr>
+                                </thead>
+                            </table>
+                        </div>
+                        <div style="height:300px;overflow-y: auto;">
+                            <table class="wanted-sub-tab table">
+                                <tr ng-repeat="(index, list) in item.content">
+                                    <td width="60" ng-bind="index + 1">45325</td>
+                                    <td width="110" ng-bind="list.code">45325</td>
+                                    <td width="130" ng-bind="list.code1">45325</td>
+                                    <td ng-bind="list.code2">45325</td>
+                                    <td width="210" ng-bind="list.code3">45325</td>
+                                    <td width="130" ng-bind="list.code4">45325</td>
+                                    <td width="130" ng-bind="list.code5">45325</td>
+                                </tr>
+                            </table>
+                        </div>
+                    </td>
+                </tr>
+                </tbody>
+
+                <!--其它出入库-->
+                <tbody ng-if="handleItem === 1">
+                <tr>
+                    <td>系统自动生成</td>
+                    <td><input type="text" class="form-control"></td>
+                    <td>腌肉入库</td>
+                    <td>张三</td>
+                    <td>2018-12-12 12：！@：</td>
+                    <td><span class="btn-click">确认</span><span class="btn-click">取消</span></td>
+                </tr>
+                <tr>
+                    <td colspan="6">
+                        <table class="wanted-sub-tab table">
+                            <caption>
+                                明细列表：
+                            </caption>
+                            <thead>
+                            <tr>
+                                <th width="60">序号</th>
+                                <th width="110">型号</th>
+                                <th width="130">品牌</th>
+                                <th>物料名称</th>
+                                <th width="210">规格</th>
+                                <th width="130">数量(PCS)</th>
+                                <th width="130">单价</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td>1</td>
+                                <td>
+                                    <div class="down-form">
+                                        <input type="text" class="form-control" ng-change="onChange()" ng-focus="onFocus($event)" ng-blur="onBlur()">
+                                        <ul class="list-unstyled">
+                                            <li>
+                                                <span>464it655-01k</span>
+                                                <span>panasonic</span>
+                                                <span>panasonic</span>
+                                                <span>panasonic</span>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </td>
+                                <td><input type="text" class="form-control" readonly></td>
+                                <td><input type="text" class="form-control" readonly></td>
+                                <td><input type="text" class="form-control" readonly></td>
+                                <td><input type="text" class="form-control"></td>
+                                <td><input type="text" class="form-control"></td>
+                            </tr>
+                            <tr>
+                                <td>1</td>
+                                <td>
+                                    <div class="down-form">
+                                        <input type="text" class="form-control" ng-change="onChange()" ng-focus="onFocus($event)" ng-blur="onBlur()">
+                                        <ul class="list-unstyled">
+                                            <li>
+                                                <span>464it655-01k</span>
+                                                <span>panasonic</span>
+                                                <span>panasonic</span>
+                                                <span>panasonic</span>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </td>
+                                <td><input type="text" class="form-control" readonly></td>
+                                <td><input type="text" class="form-control" readonly></td>
+                                <td><input type="text" class="form-control" readonly></td>
+                                <td><input type="text" class="form-control"></td>
+                                <td><input type="text" class="form-control"></td>
+                            </tr>
+                            <tr>
+                                <td>1</td>
+                                <td>
+                                    <div class="down-form">
+                                        <input type="text" class="form-control" ng-change="onChange()" ng-focus="onFocus($event)" ng-blur="onBlur()">
+                                        <ul class="list-unstyled">
+                                            <li>
+                                                <span>464it655-01k</span>
+                                                <span>panasonic</span>
+                                                <span>panasonic</span>
+                                                <span>panasonic</span>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </td>
+                                <td><input type="text" class="form-control" readonly></td>
+                                <td><input type="text" class="form-control" readonly></td>
+                                <td><input type="text" class="form-control" readonly></td>
+                                <td><input type="text" class="form-control"></td>
+                                <td><input type="text" class="form-control"></td>
+                            </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <span class="btn-click">增加一</span>
+                                    <span class="btn-click">增加十条</span>
+                                    <span class="btn-click">清空</span>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </td>
+                </tr>
+                </tbody>
+
+                <!--采购出入库-->
+                <tbody ng-if="handleItem === 2" ng-repeat="item in lockData" ng-class="{'toggle-mode': item.seleted}">
+                <tr>
+                    <td>系统自动生成</td>
+                    <td>HFH32543256438403685</td>
+                    <td ng-bind="item.maiName">深圳有陵县什么 翁一搂的</td>
+                    <td ng-bind="item.selfSupport">腌肉入库</td>
+                    <td ng-bind="item.uuid">张三</td>
+                    <td ng-bind="item.date">2018-12-12 12：！@：</td>
+                    <td ng-if="!item.seleted"><span class="btn-click" ng-click="item.seleted = !item.seleted" ng-bind="storage_tab === 'inPut' ? '收货入库' : '发货出库'"></span></td>
+                    <td ng-if="item.seleted"><span class="btn-click">确定</span><span class="btn-click">取消</span></td>
+                </tr>
+                <tr ng-show="item.seleted">
+                    <td colspan="7">
+                        <div class="sub-table-head">
+                            <table class="wanted-sub-tab table">
+                                <caption>
+                                    明细列表：
+                                    <span>所属订单：1231243243243543534543</span>
+                                </caption>
+                                <thead>
+                                <tr>
+                                    <th width="60">序号</th>
+                                    <th width="110">型号</th>
+                                    <th width="130">品牌</th>
+                                    <th>物料名称</th>
+                                    <th width="210">规格</th>
+                                    <th width="130">数量(PCS)</th>
+                                    <th width="130">单价</th>
+                                </tr>
+                                </thead>
+                            </table>
+                        </div>
+                        <div style="height:300px;overflow-y: auto;">
+                            <table class="wanted-sub-tab table">
+                                <tr ng-repeat="(index, list) in item.content">
+                                    <td width="60" ng-bind="index + 1">45325</td>
+                                    <td width="110" ng-bind="list.code">45325</td>
+                                    <td width="130" ng-bind="list.code1">45325</td>
+                                    <td ng-bind="list.code2">45325</td>
+                                    <td width="210" ng-bind="list.code3">45325</td>
+                                    <td width="130"><input type="text" class="form-control"></td>
+                                    <td width="130" ng-bind="list.code5">45325</td>
+                                </tr>
+                            </table>
+                        </div>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <div class="wanted_list">
             <!--在售产品-->
             <div class="tab">
                 <table class="vendor-tab public-tab table">
@@ -1784,7 +1947,7 @@
 </div>
 <style>
     /**/
-    .wanted_list01 .empty{
+    .wanted_list .empty{
         overflow: hidden;
         width:100%;
         display:inline-flex;
@@ -1792,21 +1955,21 @@
         align-items: center;
         height:360px;
     }
-    .wanted_list01 .empty-info{
+    .wanted_list .empty-info{
         line-height: 28px;
         padding-top:10px;
         margin-left:10px;
         text-align:left;
     }
-    .wanted_list01 .empty-info .grey{
+    .wanted_list .empty-info .grey{
         color: #999;
         font-size: 14px;
     }
-    .wanted_list01 .empty .empty-info>a{
+    .wanted_list .empty .empty-info>a{
         font-size: 14px;
         color: #5078cb;
     }
-    .wanted_list01 .empty .empty-info i{
+    .wanted_list .empty .empty-info i{
         display: inline-block;
         width: 18px;
         height: 18px;
@@ -1815,7 +1978,7 @@
         position: relative;
         top: 7px;
     }
-    .device .wanted_list01 a.Regulpica:hover{
+    .device .wanted_list a.Regulpica:hover{
         border-bottom: 0 !important;
     }
     .zhezhaodang {
@@ -1833,16 +1996,16 @@
     $(function(){
         $(document).on('click', function () {
             if ($(document).scrollTop() + $(window).height() < $('.record-line').offset().top + $('.record-line').height()) {
-                $('.wanted_list01 .tab table>tbody>tr.batch-tr').addClass('active')
+                $('.wanted_list .tab table>tbody>tr.batch-tr').addClass('active')
             } else {
-                $('.wanted_list01 .tab table>tbody>tr.batch-tr').removeClass('active')
+                $('.wanted_list .tab table>tbody>tr.batch-tr').removeClass('active')
             }
         })
         $(window).bind("scroll",function() {
             if ($(document).scrollTop() + $(window).height() < $('.record-line').offset().top + $('.record-line').height()) {
-                $('.wanted_list01 .tab table>tbody>tr.batch-tr').addClass('active')
+                $('.wanted_list .tab table>tbody>tr.batch-tr').addClass('active')
             } else {
-                $('.wanted_list01 .tab table>tbody>tr.batch-tr').removeClass('active')
+                $('.wanted_list .tab table>tbody>tr.batch-tr').removeClass('active')
             }
         });
     })

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

@@ -601,12 +601,15 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material">公司产品库</a></li>
-                <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
-                <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
+                <!--<li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material">公司产品库</a></li>-->
+                <!--<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>-->
+                <!--<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>-->
+                <!--<li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>-->
+                <!--<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>-->
+                <!--<li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>-->
+                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">产品库</a></li>
                 <li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>
-                <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
-                <li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>
+                <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架记录</a></li>
             </ul>
         </div>
         <div class="search-check">