验收修改

src/main/webapp/resources/css/common.css

@@ -988,6 +988,9 @@ select {
 	display: inline-block;
 	float: left;
 }
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box .item span {
+	color: #999;
+}
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
 	width: 520px;
 }
@@ -1019,12 +1022,6 @@ select {
 	width: 128px;
 	margin-bottom: 16px;
 }
-.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-small .item span {
-	color: #666;
-}
-.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-small .item:first-child span {
-	color: #999;
-}
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap .remain {
 	margin-top: 24px;
 }

src/main/webapp/resources/view/usercenter/forstore/bomDetail.html

@@ -120,10 +120,12 @@
         left: 10px;
     }
     .seek-purchase .seek-purchase-content >table >tbody {
-        border-right: 1px solid #dae5fd;
         border-left: 1px solid #dae5fd;
         border-bottom: 1px solid #dae5fd;
     }
+    .seek-purchase .seek-purchase-content >table >tbody tr.default-row td:last-child {
+        border-right: 1px solid #dae5fd;
+    }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row {
         border-bottom: 1px solid #dae5fd;
     }
@@ -322,6 +324,9 @@
         margin: 0 0 18px 0;
     }
     /*提示框样式 end*/
+    .seek-purchase .seek-purchase-content >table >tbody.pager-tbody {
+        border: none;
+    }
     .seek-purchase .seek-purchase-content >table >tbody tr.pager-row td div {
         text-align: right;
         padding-right: 15px;
@@ -508,15 +513,10 @@
         <table ng-table="seekPurchaseTableParams">
             <thead>
             <tr>
-                <th width="165">发布时间</th>
-                <th width="125">型号</th>
-                <th width="169">品牌</th>
-                <th width="93">采购数量</th>
-                <th width="78">单价预算</th>
-                <th width="70">封装</th>
-                <th width="105">生产日期</th>
-                <th width="123">截止时间</th>
-                <th width="81">
+                <th width="102">发布时间</th>
+                <th width="670">产品信息</th>
+                <th width="132">截止时间</th>
+                <th width="96">状态</th>
                     <!--
                     <select class="select-adder form-control" ng-model="searchStatus" ng-change="onSearch(searchStatus)">
                         <option value="0">全部</option>
@@ -525,8 +525,6 @@
                         <option value="202">已采纳</option>
                     </select>
                     -->
-                    状态
-                </th>
                 <!--
                 <th width="92">操作</th>
                 -->
@@ -534,15 +532,27 @@
             </thead>
             <tbody ng-repeat="seek in bomInfo.inquiryItems">
             <tr class="default-row">
-                <td ng-bind="seek.date | date:'yyyy-MM-dd HH:mm:ss'"></td>
-                <td ng-bind="seek.cmpCode || '-'" title="{{seek.cmpCode}}"></td>
-                <td ng-bind="seek.inbrand || '-'" title="{{seek.inbrand}}"></td>
-                <td ng-bind="seek.needquantity || '-'"></td>
                 <td>
-                    <span>{{seek.currency + seek.unitPrice | currencyStr}}</span>
+                    <div class="row-wrap">
+                        <div ng-bind="seek.date | date:'yyyy-MM-dd'"></div>
+                        <div class="date-bottom-item" ng-bind="seek.date | date:'HH:mm:ss'"></div>
+                    </div>
+                </td>
+                <td>
+                    <div class="row-wrap il-content">
+                        <div class="il-box-large il-box">
+                            <div title="{{seek.prodTitle}}" class="fl item"><span>类目：</span><div class="content">{{seek.prodTitle || '-'}}</div></div>
+                            <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
+                            <div title="{{seek.inbrand}}" class="fl item bottom"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
+                        </div>
+                        <div class="il-box-small il-box">
+                            <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
+                            <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
+                            <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
+                        </div>
+                    </div>
                 </td>
-                <td ng-bind="seek.encapsulation || '-'" title="{{seek.encapsulation}}">盘装</td>
-                <td ng-bind="seek.produceDate || '-'" title="{{seek.produceDate}}">2012-12-12</td>
                 <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
                 <td class="left-time" ng-if="seek.remainingTime <= 0"><span style="color: red;">已截止</span></td>
                 <td>
@@ -653,7 +663,7 @@
                 </td>
             </tr>
             </tbody>
-            <tbody>
+            <tbody class="pager-tbody">
             <tr class="pager-row">
                 <td colspan="10">
                     <div>

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

@@ -295,9 +295,10 @@
         top: 0;
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.input-number input {
-        width: 80px;
+        width: 105px;
         height: 26px;
         text-align: center;
+        padding: 0 20px;
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.input-number span {
         width: 17px;
@@ -320,7 +321,7 @@
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.input-number span:last-child {
         top: 12px;
-        right: 10px;
+        right: -5px;
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate a {
         color: #5078cb;
@@ -462,6 +463,9 @@
         margin: 0 0 18px 0;
     }
     /*提示框样式 end*/
+    .seek-purchase .seek-purchase-content >table >tbody.pager-tbody {
+        border: none;
+    }
     .seek-purchase .seek-purchase-content >table >tbody tr.pager-row td div {
         text-align: right;
         padding-right: 15px;
@@ -487,7 +491,7 @@
     .seek-purchase .bom-manage {
         margin: 10px 0 0 0;
         background: #fff;
-        padding-bottom: 30px;
+        padding-bottom: 60px;
     }
     .seek-purchase .bom-manage .bom-manage-header {
         height: 83px;
@@ -957,8 +961,8 @@
                 </td>
             </tr>
             </tbody>
-            <tbody>
-            <tr class="pager-row" ng-if="seekListData.totalElements > 0">
+            <tbody class="pager-tbody">
+                <tr class="pager-row" ng-if="seekListData.totalElements > 0">
                 <td colspan="10">
                     <div>
                         显示&nbsp;{{(seekListData.number - 1 ) * seekListData.size + 1}}-{{seekListData.number * seekListData.size}}&nbsp;条，共&nbsp;{{seekListData.totalElements}}&nbsp;条