求购

src/main/webapp/resources/js/vendor/app.js

@@ -984,6 +984,12 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 		}
 	});
 
+	app.filter('currencyStr', function () {
+		return function (str) {
+			return str ? str.startsWith('RMB') ? '￥' + str.substring(3, str.length) : '$' + str.substring(3, str.length) : '-';
+		}
+	});
+
 	app.controller('editPictureCtrl', ['$scope', 'pic', '$modalInstance', function ($scope, pic, $modalInstance) {
 		console.log('log')
 		$scope.pic = pic;

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

@@ -143,35 +143,35 @@
         font-weight: normal;
         font-size: 14px;
     }
-    .seek-purchase .seek-purchase-content table tbody tr {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row {
         border-bottom: 1px solid #dae5fd;
         border-left: 1px solid #dae5fd;
         border-right: 1px solid #dae5fd;
     }
-    .seek-purchase .seek-purchase-content table tbody tr:hover {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row:hover {
         background: #f1f5ff;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td {
         font-size: 14px;
         text-align: center;
         height: 80px;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.release-time {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.release-time {
         position: relative;
         padding-top: 30px;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.release-time span {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.release-time span {
         display: block;
         font-size: 12px;
         margin-bottom: 6px;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.release-time .seek-status {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.release-time .seek-status {
         position: absolute;
         left: 0;
         top: 0;
         width: 130px;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.release-time .seek-status div{
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.release-time .seek-status div{
         position: relative;
         width: 60px;
         padding-right: 3px;
@@ -181,10 +181,10 @@
         color: #fff;
         float: left;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.release-time .seek-status div.no-grounding {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.release-time .seek-status div.no-grounding {
         background: #f62d37;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.release-time .seek-status div::after {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.release-time .seek-status div::after {
         content: '';
         position: absolute;
         right: 0;
@@ -192,30 +192,30 @@
         border-bottom: 21px solid #fff;
         border-left: 5px solid transparent;
     }
-    .seek-purchase .seek-purchase-content table tbody tr:hover td.release-time .seek-status div::after {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row:hover td.release-time .seek-status div::after {
         border-bottom: 21px solid #f1f5ff;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.release-time .seek-status a {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.release-time .seek-status a {
         display: block;
         white-space: nowrap;
         color: #4290f7;
         height: 21px;
         line-height: 21px;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.unit-price,
-    .seek-purchase .seek-purchase-content table tbody tr td.left-time span{
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.unit-price,
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.left-time span{
         color: #f62d37;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.unit-price span {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.unit-price span {
         font-size: 12px;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.operate {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.operate {
         font-size: 12px;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.operate a{
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.operate a{
         color: #4290f7;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.operate div {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.operate div {
         width: 64px;
         height: 24px;
         line-height: 24px;
@@ -226,11 +226,28 @@
         cursor: pointer;
         border-radius: 2px;
     }
-    .seek-purchase .seek-purchase-content table tbody tr td.operate span {
+    .seek-purchase .seek-purchase-content table tbody tr.default-row td.operate span {
         margin: 17px 0 0 0;
         color: #39ae05;
         display: block;
     }
+    .seek-purchase .seek-purchase-content table tbody tr.expand-row{
+        height: 40px;
+        line-height: 40px;
+        background: #fffbf0;
+        border: 1px solid #dae5fd;
+    }
+    .seek-purchase .seek-purchase-content table tbody tr.expand-row td {
+        font-size: 14px;
+        text-align: center;
+        color: #020202;
+    }
+    .seek-purchase .seek-purchase-content table tbody tr.expand-row td >div {
+        float: left;
+    }
+    .seek-purchase .seek-purchase-content table tbody tr.expand-row td span {
+        color: #f62d37;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -267,28 +284,30 @@
                 <span>发布时间&nbsp;</span>
                 <div class="date fl">
                     <div class="data-input">
-                        <input id="start" type="text" ng-model="startDate" readonly="readonly"
+                        <input type="text" ng-model="startDate"
                                class="form-control select-adder" placeholder="起始时间"
-                               datepicker-popup="yyyy-MM-dd"
-                               is-open="condition[0].open"
-                               current-text="今天" clear-text="清除" close-text="关闭"
+                               datepicker-popup="yyyy-MM-dd HH:mm:ss"
+                               is-open="condition.startDateOpen"
+                               max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
+                               ng-click="openDatePicker($event, condition, 'startDateOpen',1)"
                                datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                               ng-click="openDatePicker($event, condition, 0,1)"
-                               ng-change="onDateCondition(1)"/>
-                        <button class="open" ng-click="openDatePicker($event, condition, 0)"></button>
+                               ng-change="vaildDate(true)"
+                        />
+                        <button class="open" ng-click="openDatePicker($event, condition, 'startDateOpen')"></button>
                     </div>
 
                     <em>–</em>
                     <div class="data-input">
-                        <input id="end" type="text" ng-model="endDate" readonly="readonly"
+                        <input type="text" ng-model="endDate"
                                class="form-control select-adder" placeholder="结束时间"
-                               datepicker-popup="yyyy-MM-dd"
-                               is-open="condition[1].open"
-                               current-text="今天" clear-text="清除" close-text="关闭"
+                               datepicker-popup="yyyy-MM-dd HH:mm:ss"
+                               is-open="condition.endDateOpen"
+                               min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
+                               ng-click="openDatePicker($event, condition, 'endDateOpen',2)"
                                datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                               ng-click="openDatePicker($event, condition, 1, 2)"
-                               ng-change="onDateCondition(2)"/>
-                        <button class="open" ng-click="openDatePicker($event, condition, 1)"></button>
+                               ng-change="changeEndDate()"
+                        />
+                        <button class="open" ng-click="openDatePicker($event, condition, 'endDateOpen')"></button>
                     </div>
                 </div>
                 <div class="sreach-input fr">
@@ -313,7 +332,7 @@
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="seek in seekPurchases">
+                <tr class="default-row" ng-repeat="seek in seekPurchases" ng-mouseenter="seek.hover=true">
                     <td class="release-time">
                         <span ng-bind="seek.seekPurchase.releaseDate"></span>
                         <span>14:45:50</span>
@@ -323,43 +342,27 @@
                             <div ng-show="seek.goodsId != null">已上架</div>
                         </div>
                     </td>
-                    <td ng-bind="seek.seekPurchase.userName"></td>
+                    <td class="user-name"><div ng-bind="seek.seekPurchase.userName"></div></td>
                     <td ng-bind="seek.seekPurchase.code"></td>
                     <td ng-bind="seek.seekPurchase.brand"></td>
                     <td ng-bind="seek.seekPurchase.encapsulation || '--'"></td>
                     <td ng-bind="seek.seekPurchase.produceDate || '--'"></td>
                     <td ng-bind="seek.seekPurchase.amount || '--'"></td>
-                    <td class="unit-price"><span ng-bind="seek.seekPurchase.currency+seek.seekPurchase.unitPrice"></span></td>
+                    <td class="unit-price"><span>{{(!seek.seekPurchase.unitPrice || seek.seekPurchase.unitPrice == null ? null : seek.seekPurchase.currency+seek.seekPurchase.unitPrice) | currencyStr}}</span></td>
                     <td class="left-time">剩余&nbsp;<span>5</span>&nbsp;小时</td>
                     <td class="operate">
                         <a>联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
                         <div>我要报价</div>
                     </td>
+                    <tr class="expand-row">
+                        <td colspan="10">
+                            <div style="width: 173px;">历史报价</div>
+                            <div style="width: 180px;">单价：<span>￥986</span></div>
+                            <div style="width: 182px;">交期：<span>6天</span></div>
+                            <div style="width: 271px;">生产时间：2016-12-12</div>
+                        </td>
+                    </tr>
                 </tr>
-                <!--
-                <tr>
-                    <td class="release-time">
-                        <span>2016-12-03</span>
-                        <span>14:45:50</span>
-                        <div class="seek-status">
-                            <div class="no-grounding">已上架</div>
-                            <a>去上架>></a>
-                        </div>
-                    </td>
-                    <td>深圳市优软科技有限公司</td>
-                    <td>MADANSFA-12345</td>
-                    <td>panasonic</td>
-                    <td>盘装</td>
-                    <td>2016-12-12</td>
-                    <td>5000</td>
-                    <td class="unit-price"><span>$</span>5000</td>
-                    <td class="left-time"><span>已截止</span></td>
-                    <td class="operate">
-                        <a>联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                        <span>已报价 <img src="static/img/seekPurchase/check.png" alt=""></span>
-                    </td>
-                </tr>
-                -->
             </tbody>
         </table>
     </div>