spec

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

@@ -343,6 +343,8 @@ define(['app/app'], function (app) {
               inquiryItem.date = new Date();
               inquiryItem.endDate = $scope.applyObj.deadline;
               inquiryItem.encapsulation = $scope.applyObj.encapsulation;
+              inquiryItem.spec = $scope.applyObj.spec;
+              inquiryItem.prodTitle = $scope.applyObj.prodTitle;
               var inquiryItems = [];
               inquiryItems.push(inquiryItem);
               inquiry.inquiryItems = inquiryItems;

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

@@ -238,7 +238,11 @@
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td {
         font-size: 14px;
         text-align: center;
-        height: 70px;
+        height: 117px;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap {
+        height: 100%;
+        padding-top: 15px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td.operate-seek >span {
         color: #4290f7;
@@ -725,6 +729,14 @@
                     <span>生产日期</span>
                     <input type="text" class="form-group" ng-model="applyObj.produceDate" ng-change="onProduceDateChange()">
                 </div>
+                <div class="form-block">
+                    <span>规格</span>
+                    <input type="text" class="form-group" ng-model="applyObj.spec">
+                </div>
+                <div class="form-block">
+                    <span>类目</span>
+                    <input type="text" class="form-group" ng-model="applyObj.prodTitle">
+                </div>
                 <a href="javascript:void(0)" ng-click="release()">发布求购</a>
             </div>
         </div>
@@ -785,57 +797,55 @@
         <table ng-table="seekPurchaseTableParams">
             <thead>
             <tr>
-                <th width="165">发布时间</th>
-                <th width="202">型号 / 品牌</th>
-                <th width="93">采购数量</th>
-                <th width="78">单价预算</th>
-                <th width="70">封装</th>
-                <th width="105">生产日期</th>
-                <th width="123">截止时间</th>
-                <th width="81">
-                    <!--
-                    <select class="select-adder form-control" ng-model="searchStatus" ng-change="onSearch(searchStatus)">
-                        <option value="0">全部</option>
-                        <option value="">待报价</option>
-                        <option value="done">已报价</option>
-                        <option value="202">已采纳</option>
-                    </select>-->
-                    状态
-                </th>
-                <th width="92">操作</th>
+                <th width="102">发布时间</th>
+                <th width="670">产品信息</th>
+                <th width="132">状态/截止时间</th>
+                <th width="96">操作</th>
             </tr>
             </thead>
             <tbody ng-repeat="seek in seekListData.content">
             <tr class="default-row">
-                <td ng-bind="seek.date | date:'yyyy-MM-dd HH:mm'"></td>
-                <td style="text-align: left;">
-                    <p title="{{seek.cmpCode}}" class="text-bold" style="width: 205px;">
-                        <span ng-bind="seek.cmpCode || '-'"></span>
-                    </p>
-                    <p title="{{seek.inbrand}}" ng-bind="seek.inbrand || '-'" style="width: 205px;"></p>
+                <td>
+                    <div class="row-wrap">
+                        <div ng-bind="seek.date | date:'yyyy-MM-dd'"></div>
+                        <div ng-bind="seek.date | date:'HH:ss'"></div>
+                    </div>
                 </td>
-                <td ng-bind="seek.needquantity || '-'"></td>
                 <td>
-                    <span title="{{seek.currency + seek.unitPrice | currencyStr}}">{{seek.currency + seek.unitPrice | currencyStr}}</span>
+                    <div class="row-wrap">
+                        <div class="il-box-large il-box">
+                            <div title="seek.inbrand" class="fl item"><span>类目：</span><div class="content">{{seek.inbrand || '-'}}</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.cmpCode" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
+                        </div>
+                        <div class="il-box-small il-box">
+                            <div title="seek.cmpCode" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
+                            <div title="seek.cmpCode" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
+                            <div title="seek.cmpCode" 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 class="left-time" ng-if="seek.remainingTime == null"><span style="color: red;">-</span></td>
                 <td>
-                    <span ng-if="seek.offerAmount == 0" style="color:red;">待报价</span>
-                    <span ng-if="seek.agreed == 0 && seek.offerAmount > 0">已报价</span>
-                    <span ng-if="seek.agreed == 1" style="color:green;">已采纳</span>
+                    <div class="row-wrap">
+                        <span ng-if="seek.offerAmount == 0" style="color:red;">待报价</span>
+                        <span ng-if="seek.agreed == 0 && seek.offerAmount > 0">已报价</span>
+                        <span ng-if="seek.agreed == 1" style="color:green;">已采纳</span>
+                        <div ng-if="seek.remainingTime && 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></div>
+                        <div ng-if="seek.remainingTime && seek.remainingTime <= 0"><span style="color: red;">已截止</span></div>
+                        <div ng-if="seek.remainingTime == null"><span>-</span></div>
+                    </div>
                 </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>
-                    <span 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"></i></span>
-                    <span ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2)" ng-click="setSeekStatus(seek, 0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></span>
+                    <div class="row-wrap">
+                        <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>
+                        <span 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"></i></span>
+                        <span ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2)" ng-click="setSeekStatus(seek, 0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></span>
+                    </div>
                 </td>
             </tr>
             <tr class="expand-row" ng-if="seek.$status == 1 || seek.$status == 2">
-                <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)">商城现货（<span ng-bind="goodsCount"></span>）</a>