优化bom

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

@@ -133,20 +133,20 @@
         background: #f1f5ff;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row:hover  .sharecode{
-        display: block
+        opacity: 1;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td {
         font-size: 14px;
         text-align: center;
         height: 100%;
     }
-    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td.operate-seek{
+    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .operate-seek{
         text-align: left;
         text-indent: 12px;
         border-right: 1px solid #dae5fd;
         line-height: 68px;
     }
-    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td.operate-seek >span {
+    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .operate-seek >span {
         color: #4290f7;
         cursor: pointer;
         margin-left: 37px;
@@ -353,7 +353,7 @@
         color: #4290f7;
     }
     .seek-purchase .seek-purchase-content .BOM-header {
-        height: 164px;
+        /*height: 164px;*/
         padding: 14px;
     }
     .seek-purchase .seek-purchase-content .BOM-header > a {
@@ -361,11 +361,11 @@
         color: #4290f7;
     }
     .seek-purchase .seek-purchase-content .BOM-header > div {
-        height: 100px;
+        /*height: 100px;*/
         margin: 14px 0 0 0;
         /*line-height: 100px;*/
         border: 1px dashed #fd7748;
-        padding: 10px 66px 0 21px;
+        padding: 20px 30px 20px 21px;
     }
     .seek-purchase .seek-purchase-content .BOM-header > div span {
         font-size: 22px;
@@ -449,7 +449,7 @@
     }
     .seek-purchase .sharecode {
         /*position: absolute;*/
-        display: none;
+        opacity: 0;
         right: 0;
         top: 0;
         /*z-index: 99;*/
@@ -549,6 +549,21 @@
         margin: 15px auto;
         margin-bottom: 10px
     }
+    .clearfix:after {
+        clear: both;
+        content: ' ';
+        display: block;
+        visibility: hidden;
+        zoom: 1;
+    }
+    .pull-right {float: right}
+    .clearfix .title{
+        font-size: 14px;
+        color: #333
+    }
+    .BOM-header .clearfix {
+        margin-bottom: 10px
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -556,21 +571,39 @@
         <div class="BOM-header">
             <a href="user#/seekPurchase?type=bomManage&bomTab=seekRecord">&lt;返回BOM列表</a>
             <div>
-                <div class="BOM-name-area" ng-show="!isEditName">
-                    <span ng-bind="bomInfo.remark"></span>
-                    <a ng-bind="bomInfo.date | date:'yyyy-MM-dd HH:mm:ss'"></a>
-                    <div class="progress">
-                        <div class="left">{{bomInfo.quotedAmount || 0}}</div>
-                        <div class="progressBtn" ng-style="{width: bomInfo.quotedAmount / bomInfo.amount * '100' + '%'}"></div>
-                        <div class="right" ng-if="bomInfo.amount - bomInfo.quotedAmount > 0">{{bomInfo.amount - bomInfo.quotedAmount}}</div>
+                <div class="clearfix">
+                    <div class="BOM-name-area clearfix" ng-show="!isEditName">
+                        <span ng-bind="bomInfo.remark" class="fl"></span>
+                        <!--<a ng-bind="bomInfo.date | date:'yyyy-MM-dd HH:mm:ss'"></a>-->
+                        <div class="pull-right" style="font-size: 14px;">
+                            <div class="progress">
+                                <div class="left">{{bomInfo.quotedAmount || 0}}</div>
+                                <div class="progressBtn" ng-style="{width: bomInfo.quotedAmount / bomInfo.amount * '100' + '%'}"></div>
+                                <div class="right" ng-if="bomInfo.amount - bomInfo.quotedAmount > 0">{{bomInfo.amount - bomInfo.quotedAmount}}</div>
+                            </div>
+                        </div>
                     </div>
-                    <p>本单共<span>{{bomInfo.amount}}</span>个产品，<span>{{bomInfo.quotedAmount || 0}}</span>个已报价(其中{{bomInfo.replaceQuotedAmount || 0}}个为替代料报价)</p>
+                    <p class="BOM-edit fr" ng-show="isEditName">
+                        <input type="text" class="form-control" ng-change="onBomNameChange()" ng-model="bomName">
+                        <a ng-click="setIsEditName(false)">取消</a>
+                        <a ng-click="saveBomName()">确认</a>
+                    </p>
+                </div>
+                <div class="clearfix">
+                    <div class="fl title">规格：13312314</div>
+                    <div class="title pull-right" style="font-size: 14px;color: #333;">本单共<span style="color: #fd7748;margin-right: 0px;font-size: 14px">{{bomInfo.amount}}</span>个产品，<span style="color: #fd7748;margin-right: 0px;font-size: 14px">{{bomInfo.quotedAmount || 0}}</span>个已报价(其中{{bomInfo.replaceQuotedAmount || 0}}个为替代料报价)</div>
+                </div>
+                <div class="clearfix">
+                    <div class="fl title">采购数量(套)：13312314</div>
+                    <div class="title pull-right">价格分析:按价格最低<span style="color: #fd7748;margin-right: 0px;font-size: 14px">30</span>个报告,合计¥:<span style="color: #008000;margin-right: 0px;font-size: 14px">50000.00</span></div>
+                </div>
+                <div class="clearfix">
+                    <div class="fl title">发布时间：{{bomInfo.date | date:'yyyy-MM-dd HH:mm:ss'}}</div>
+                    <div class="title pull-right">按交期最短<span style="color: #fd7748;margin-right: 0px;font-size: 14px">30</span>个报告,合计¥:<span style="color: #008000;margin-right: 0px;font-size: 14px">50000.00</span></div>
+                </div>
+                <div class="clearfix">
+                    <div class="fl title">截止时间：{{bomInfo.date | date:'yyyy-MM-dd HH:mm:ss'}}</div>
                 </div>
-                <p class="BOM-edit" ng-show="isEditName">
-                    <input type="text" class="form-control" ng-change="onBomNameChange()" ng-model="bomName">
-                    <a ng-click="setIsEditName(false)">取消</a>
-                    <a ng-click="saveBomName()">确认</a>
-                </p>
                 <!--
                 <div class="fr">
                     <b>配单分析：</b><span>本单共<span class="blue-text" ng-bind="bomInfo.productAmount || 0"></span>个产品，<span class="red-text" ng-bind="bomInfo.offerAmount || 0"></span>个有报价。</span>
@@ -646,12 +679,12 @@
         <table ng-table="seekPurchaseTableParams">
             <thead>
             <tr>
-                <th width="110">发布时间</th>
-                <th width="260">品牌/物料名称</th>
-                <th width="260">型号/规格</th>
-                <th width="110">采购数量(PCS)</th>
-                <th width="120">状态/截止日期</th>
-                <th width="136">操作</th>
+                <!--<th width="110">发布时间</th>-->
+                <th width="310">品牌/物料名称</th>
+                <th width="310">型号/规格</th>
+                <th width="190">求购数量(PCS)</th>
+                <th width="190">状态</th>
+                <!--<th width="136">操作</th>-->
                     <!--
                     <select class="select-adder form-control" ng-model="searchStatus" ng-change="onSearch(searchStatus)">
                         <option value="0">全部</option>
@@ -669,12 +702,12 @@
             </thead>
             <tbody ng-repeat="seek in bomInfo.inquiryItems">
             <tr class="default-row">
-                <td>
-                    <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">-->
+                        <!--<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">
@@ -702,11 +735,35 @@
                     </div>
                 </td>
                 <td class="left-time">
-                    <div class="row-wrap">
+                    <div class="row-wrap" style="border-right: 1px solid #dae5fd;">
                         <span ng-if="seek.offerAmount == 0 || !seek.offerAmount" style="color:red;">待报价</span>
                         <span ng-if="(seek.agreed == 0 || !seek.agreed) && seek.offerAmount > 0">已报价</span>
                         <span ng-if="seek.agreed == 1" style="color:green;">已采纳</span>
-                        <div style="margin-top: 34px;">{{seek.endDate | date : 'yyyy-MM-dd'}}</div>
+                        <div  class="operate-seek" style="text-align: center">
+                            <span style="margin-left:0;" ng-if="seek.offerAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&nbsp;<i class="fa fa-angle-double-down" style="display: contents;"></i></span>
+                            <span style="margin-left:0;" ng-if="seek.goodsAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 1)">商城现货&nbsp;<i class="fa fa-angle-double-down" style="display: contents;"></i></span>
+                            <span style="margin-left:0;" ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2 || seek.$status == 3)" ng-click="setSeekStatus(seek, 0, true)">收起&nbsp;<i class="fa fa-angle-double-up" style="display: contents;"></i></span>
+                            <!--<span ng-if="seek.offerAmount == 0" style="color:red;">待报价</span>-->
+                            <!--<span ng-if="seek.offerAmount > 0">已报价</span>-->
+                            <div class="sharecode" ng-mouseover="setShowShare(seek,$index)" ng-mouseleave="hideShare($index)">
+                                <div class="sharecodeT">分<br/>享</div>
+                                <div class="sharecodeBtn">
+                                    <img src="static/img/user/images/code.png" />
+                                </div>
+                            </div>
+                            <div ng-style="caleTop($index)" class="sharescancode icon-style" ref="sharescancode" ng-mouseover="setShowShare(seek,$index)" ng-mouseleave="hideShare($index)">
+                                <div class="share">
+                                    <div>
+                                        <div class="title">求购分享</div>
+                                        <div class="qrccode" ng-class="'qrccode-canvas_'+$index" width="98" height="98"></div>
+                                        <input readonly ng-value="caleUrl(seek)" ng-class="'qrccode_'+$index" >
+                                        <span ng-class="'copyLink_'+$index" ng-attr-data-clipboard-text={{caleUrl(seek)}}>复制链接</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--<span ng-switch-when="202" style="color:green;">已采纳</span>-->
+                        </div>
+                        <!--<div style="margin-top: 34px;">{{seek.endDate | date : 'yyyy-MM-dd'}}</div>-->
                       <!--  <div class="remain" 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>
@@ -716,6 +773,7 @@
                         <div class="remain" ng-if="seek.remainingTime <= 0"><span>已截止</span></div>
                         <div class="remain" ng-if="seek.remainingTime == null"><span>-</span></div>-->
                     </div>
+
                 </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>-->
@@ -726,30 +784,9 @@
                 <!--<td class="left-time" ng-if="seek.remainingTime <= 0">-->
                     <!--<span style="color: red;">已截止</span>-->
                 <!--</td>-->
-                <td class="operate-seek">
-                    <span style="margin-left:0" ng-if="seek.offerAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&nbsp;<i class="fa fa-angle-double-down" style="display: contents;"></i></span>
-                    <span style="margin-left:0" ng-if="seek.goodsAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 1)">商城现货&nbsp;<i class="fa fa-angle-double-down" style="display: contents;"></i></span>
-                    <span style="margin-left:0" ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2 || seek.$status == 3)" ng-click="setSeekStatus(seek, 0, true)">收起&nbsp;<i class="fa fa-angle-double-up" style="display: contents;"></i></span>
-                    <!--<span ng-if="seek.offerAmount == 0" style="color:red;">待报价</span>-->
-                    <!--<span ng-if="seek.offerAmount > 0">已报价</span>-->
-                    <div class="sharecode" ng-mouseover="setShowShare(seek,$index)" ng-mouseleave="hideShare($index)">
-                        <div class="sharecodeT">分<br/>享</div>
-                        <div class="sharecodeBtn">
-                            <img src="static/img/user/images/code.png" />
-                        </div>
-                    </div>
-                    <div ng-style="caleTop($index)" class="sharescancode icon-style" ref="sharescancode" ng-mouseover="setShowShare(seek,$index)" ng-mouseleave="hideShare($index)">
-                        <div class="share">
-                            <div>
-                                <div class="title">求购分享</div>
-                                <div class="qrccode" ng-class="'qrccode-canvas_'+$index" width="98" height="98"></div>
-                                <input readonly ng-value="caleUrl(seek)" ng-class="'qrccode_'+$index" >
-                                <span ng-class="'copyLink_'+$index" ng-attr-data-clipboard-text={{caleUrl(seek)}}>复制链接</span>
-                            </div>
-                        </div>
-                    </div>
-                    <!--<span ng-switch-when="202" style="color:green;">已采纳</span>-->
-                </td>
+                <!--<td>-->
+                   <!---->
+                <!--</td>-->
                 <!--
                 <td class="operate-seek">
                     <span ng-if="seek.offerAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&nbsp;<i class="fa fa-angle-double-down"></i></span>
@@ -760,7 +797,7 @@
             </tr>
 
             <tr class="expand-row" ng-if="seek.$status == 1 || seek.$status == 2 || seek.$status == 3">
-                <td colspan="10">
+                <td colspan="4">
                     <div>
                         <div class="switch-line">
                             <a ng-disabled="goodsCount == 0" ng-class="{'active': seek.$status == 1}" ng-click="setSeekStatus(seek, 1, goodsCount == 0)">商城现货（<span ng-bind="goodsCount || 0"></span>）</a>
@@ -945,7 +982,7 @@
             </tbody>
             <tbody class="pager-tbody" style="border:0px">
             <tr class="pager-row">
-                <td colspan="10">
+                <td colspan="4">
                     <div>
                         <!--显示&nbsp;{{(seekListData.number - 1 ) * seekListData.size + 1}}-{{seekListData.number * seekListData.size}}&nbsp;条，-->共&nbsp;{{bomInfo.inquiryItems.length}}&nbsp;条
                     </div>

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

@@ -616,9 +616,6 @@
         vertical-align: middle;
         margin: 0 0 0 21px;
     }
-    .seek-purchase .bom-manage > table tbody tr td .middle {
-        width: 295px;
-    }
     .seek-purchase .bom-manage tr.empty div{
         line-height: 200px;
         display: block;