Browse Source

优化求购询价列表展示

suntg 7 years ago
parent
commit
4dec7decce

+ 6 - 6
src/main/webapp/resources/js/vendor/app.js

@@ -49,12 +49,12 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 			controllerUrl: 'app/controllers/forstore/vendor_logistics_ctrl',
 			controllerUrl: 'app/controllers/forstore/vendor_logistics_ctrl',
 			controller: 'vendorLogisticsCtrl'
 			controller: 'vendorLogisticsCtrl'
 		})).state('seekPurchase', angularAMD.route({
 		})).state('seekPurchase', angularAMD.route({
-      url: '/seek',
-      templateUrl: 'static/view/vendor/forstore/seekPurchase.html',
-      title: '求购询价',
-      controllerUrl: 'app/controllers/forstore/seek_purchase_ctrl',
-      controller: 'seekPurchaseCtrl'
-    })).state('vendor_query_logistics', angularAMD.route({
+			url: '/seek',
+			templateUrl: 'static/view/vendor/forstore/seekPurchase.html',
+			title: '求购询价',
+			controllerUrl: 'app/controllers/forstore/seek_purchase_ctrl',
+			controller: 'seekPurchaseCtrl'
+		})).state('vendor_query_logistics', angularAMD.route({
             url: '/logistics/query/:purchaseid',
             url: '/logistics/query/:purchaseid',
             templateUrl: 'static/view/vendor/forstore/query_logistics.html',
             templateUrl: 'static/view/vendor/forstore/query_logistics.html',
             title: '查询物流',
             title: '查询物流',

+ 8 - 5
src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -781,8 +781,7 @@
             <thead>
             <thead>
             <tr>
             <tr>
                 <th width="165">发布时间</th>
                 <th width="165">发布时间</th>
-                <th width="125">型号</th>
-                <th width="77">品牌</th>
+                <th width="202">型号 / 品牌</th>
                 <th width="93">采购数量</th>
                 <th width="93">采购数量</th>
                 <th width="78">单价预算</th>
                 <th width="78">单价预算</th>
                 <th width="70">封装</th>
                 <th width="70">封装</th>
@@ -803,9 +802,13 @@
             </thead>
             </thead>
             <tbody ng-repeat="seek in seekListData.content">
             <tbody ng-repeat="seek in seekListData.content">
             <tr class="default-row">
             <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.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>
                 <td ng-bind="seek.needquantity || '-'"></td>
                 <td ng-bind="seek.needquantity || '-'"></td>
                 <td>
                 <td>
                     <span title="{{seek.currency + seek.unitPrice | currencyStr}}">{{seek.currency + seek.unitPrice | currencyStr}}</span>
                     <span title="{{seek.currency + seek.unitPrice | currencyStr}}">{{seek.currency + seek.unitPrice | currencyStr}}</span>

+ 15 - 20
src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -628,10 +628,8 @@
         <table ng-table="seekPurchaseTableParams">
         <table ng-table="seekPurchaseTableParams">
             <thead>
             <thead>
             <tr>
             <tr>
-                <th width="104">发布时间</th>
-                <th width="108">买家</th>
-                <th width="117">型号</th>
-                <th width="94">品牌</th>
+                <th width="212">买家 / 发布时间</th>
+                <th width="211">型号 / 品牌</th>
                 <th width="84">封装</th>
                 <th width="84">封装</th>
                 <th width="95">生产日期</th>
                 <th width="95">生产日期</th>
                 <th width="86">采购数量</th>
                 <th width="86">采购数量</th>
@@ -642,24 +640,21 @@
             </thead>
             </thead>
             <tbody ng-repeat="seek in $data track by $index" ng-class="{'active': seek.$active, 'hover': seek.$hover && (seek.status == 201 || seek.status == 202)}">
             <tbody ng-repeat="seek in $data track by $index" ng-class="{'active': seek.$active, 'hover': seek.$hover && (seek.status == 201 || seek.status == 202)}">
             <tr class="default-row" ng-mouseenter="seek.$hover = true;" ng-mouseleave="seek.$hover = false;" >
             <tr class="default-row" ng-mouseenter="seek.$hover = true;" ng-mouseleave="seek.$hover = false;" >
-                <td class="release-time">
-                    <span ng-bind="seek.inquiry.date | date:'yyyy-MM-dd'"></span>
-                    <span ng-bind="seek.inquiry.date | date:'HH:mm:ss'"></span>
-                    <!--
-                    <div class="seek-status">
-                        <div ng-show="seek.goodsEnuu" class="status">已在库</div>
-                        <div ng-show="!seek.goodsEnuu" class="no-grounding">未在库</div>
-                        <div class="BOM-list-btn" ng-if="seek.bomId">BOM清单</div>
-                        <a ng-show="!seek.goodsEnuu" target="_blank" href="vendor#/vendor_upload">产品导入>></a>
-                    </div>
-                    -->
-                </td>
                 <td class="user-name">
                 <td class="user-name">
-                    <div ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></div>
-                    <div ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></div>
+                    <p>
+                        <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
+                        <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
+                    </p>
+                    <p class="text-light">
+                        <span ng-bind="seek.date | date:'yyyy-MM-dd HH:mm'"></span>
+                    </p>
+                </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>
                 </td>
-                <td><div title="{{seek.cmpCode || seek.prodCode || seek.product.cmpCode}}" ng-bind="seek.cmpCode || seek.prodCode || seek.product.cmpCode"></div></td>
-                <td><div title="{{seek.inbrand}}" ng-bind="seek.inbrand || '-'"></div></td>
                 <td><div title="{{seek.encapsulation}}" ng-bind="seek.encapsulation || '--'"></div></td>
                 <td><div title="{{seek.encapsulation}}" ng-bind="seek.encapsulation || '--'"></div></td>
                 <td><div title="{{seek.produceDate}}" ng-bind="seek.produceDate || '--'"></div></td>
                 <td><div title="{{seek.produceDate}}" ng-bind="seek.produceDate || '--'"></div></td>
                 <td><div title="{{seek.needquantity}}" ng-bind="seek.needquantity || '--'"></div></td>
                 <td><div title="{{seek.needquantity}}" ng-bind="seek.needquantity || '--'"></div></td>

+ 15 - 18
src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -652,10 +652,8 @@
         <table ng-table="seekPurchaseTableParams">
         <table ng-table="seekPurchaseTableParams">
             <thead>
             <thead>
                 <tr>
                 <tr>
-                    <th width="104">发布时间</th>
-                    <th width="108">买家</th>
-                    <th width="117">型号</th>
-                    <th width="94">品牌</th>
+                    <th width="212">买家 / 发布时间</th>
+                    <th width="211">型号 / 品牌</th>
                     <th width="84">封装</th>
                     <th width="84">封装</th>
                     <th width="95">生产日期</th>
                     <th width="95">生产日期</th>
                     <th width="86">采购数量</th>
                     <th width="86">采购数量</th>
@@ -666,22 +664,21 @@
             </thead>
             </thead>
             <tbody ng-repeat="seek in seekListData track by $index" ng-class="{'active': seek.$active}">
             <tbody ng-repeat="seek in seekListData track by $index" ng-class="{'active': seek.$active}">
                 <tr class="default-row">
                 <tr class="default-row">
-                    <td class="release-time">
-                        <span ng-bind="seek.date | date:'yyyy-MM-dd'"></span>
-                        <span ng-bind="seek.date | date:'HH:mm:ss'"></span>
-                        <!--
-                        <div class="seek-status">
-                            <div class="status">已在库</div>
-                            <div class="BOM-list-btn" ng-if="seek.bomId">BOM清单</div>
-                        </div>
-                        -->
-                    </td>
                     <td class="user-name">
                     <td class="user-name">
-                        <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
-                        <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
+                        <p>
+                            <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
+                            <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
+                        </p>
+                        <p class="text-light">
+                            <span ng-bind="seek.date | date:'yyyy-MM-dd HH:mm'"></span>
+                        </p>
+                    </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>
                     </td>
-                    <td><div title="{{seek.cmpCode}}" ng-bind="seek.cmpCode || '-'"></div></td>
-                    <td><div title="{{seek.inbrand}}" ng-bind="seek.inbrand || '-'"></div></td>
                     <td><div title="{{seek.encapsulation}}" ng-bind="seek.encapsulation || '-'"></div></td>
                     <td><div title="{{seek.encapsulation}}" ng-bind="seek.encapsulation || '-'"></div></td>
                     <td><div title="{{seek.produceDate}}" ng-bind="seek.produceDate || '-'"></div></td>
                     <td><div title="{{seek.produceDate}}" ng-bind="seek.produceDate || '-'"></div></td>
                     <td><div title="{{seek.needquantity}}" ng-bind="seek.needquantity || '-'"></div></td>
                     <td><div title="{{seek.needquantity}}" ng-bind="seek.needquantity || '-'"></div></td>