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

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

@@ -1008,9 +1008,11 @@
         width: 98%;
         table-layout: fixed;
     }
-    .wanted_list .wanted-sub-tab caption span{
+    .wanted_list .wanted-sub-tab caption span.caption_title{
         float:right;
         margin-right:20px;
+        width: auto;
+        text-overflow: unset;
     }
     .wanted_list .wanted-sub-tab thead tr th{
         font-weight: normal;
@@ -1064,9 +1066,12 @@
         text-align: left;
         padding-left:20px;
     }
-    .wanted_list .logistics-info span{
+    .wanted_list .logistics-info > span{
         text-align: left;
         margin-right:10px;
+        width:auto;
+        text-overflow: unset;
+        display:inline-block;
     }
     .wanted_list .logistics-info span.input-ul {
         position:relative;
@@ -1180,7 +1185,7 @@
                     自定义
                 </label>
                 <div class="search fr check">
-                    <input type="text" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="发货单/卖家"/>
+                    <input type="text" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="{{storage_tab =='outBound' ? '发货单/卖家' : '订单号/买家'}}"/>
                     <button ng-click="onSearch(keyword)" style="float: left;">搜索</button>
                 </div>
             </div>
@@ -1253,8 +1258,8 @@
                 <tbody ng-if="handleItem === 0" ng-repeat="item in storageList" ng-class="{'toggle-mode': item.seleted}">
                 <tr>
                     <td ng-bind="item.inOutId">系统自动生成</td>
-                    <td ng-bind="item.affiliatedEnterprise">深圳有陵县什么 翁一搂的</td>
-                    <td ng-bind="item.opertatorType">腌肉入库</td>
+                    <td ng-bind="item.affiliatedEnterprise || '-'">深圳有陵县什么 翁一搂的</td>
+                    <td ng-bind="boundType[item.opertatorType]">腌肉入库</td>
                     <td ng-bind="item.operaterUserName">张三</td>
                     <td ng-bind="item.createTime | date : 'yyyy-MM-dd: hh:mm:ss'">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="unfoldClick(storageList,item)" class="btn-toggle" ng-show="!item.seleted">展开 <i class="fa fa-angle-down"></i></span></td>
@@ -1265,7 +1270,7 @@
                             <table class="wanted-sub-tab table">
                                 <caption ng-if="item.associateOrderid">
                                     明细列表：
-                                    <span>所属订单：<span ng-bind="item.associateOrderid"></span></span>
+                                    <span class="caption_title">所属订单：<span ng-bind="item.associateOrderid"></span></span>
                                 </caption>
                                 <thead>
                                 <tr>