业务员分配添加核价信息，修改详情页样式

src/main/java/com/uas/platform/b2c/prod/commodity/dao/ProductDao.java

@@ -177,5 +177,10 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
     @Query(value = "select p.id from Product p where p.enUU = :enuu and p.standard = :standard")
     List<Long> findPridsByEnuuAndStardand(@Param("enuu") Long enuu, @Param("standard") Integer standard);
 
-
+    /**
+     * 通过型号查询物料信息
+     * @param cmpCode
+     * @return
+     */
+    List<Product> findByCmpCode(String cmpCode);
 }

src/main/java/com/uas/platform/b2c/prod/commodity/model/Product.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2c.prod.commodity.model;
 
+import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.core.persistence.EnterpriseUU;
 import com.uas.platform.core.persistence.Logger;
 import com.uas.platform.core.persistence.UserUU;
@@ -431,6 +432,17 @@ public class Product {
 	@Column(name = "pr_taxprecon")
 	private String taxPreCon;
 
+	@Transient
+	private Enterprise enterprise;
+
+	public Enterprise getEnterprise() {
+		return enterprise;
+	}
+
+	public void setEnterprise(Enterprise enterprise) {
+		this.enterprise = enterprise;
+	}
+
 	public Product() {
 	}
 

src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekSalesmanInfoController.java

@@ -3,6 +3,8 @@ package com.uas.platform.b2c.trade.seek.controller;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
+import com.uas.platform.b2c.prod.commodity.model.Product;
+import com.uas.platform.b2c.trade.seek.model.SeekSalesman;
 import com.uas.platform.b2c.trade.seek.model.SeekSalesmanInfo;
 import com.uas.platform.b2c.trade.seek.model.SeekSalesmanMember;
 import com.uas.platform.b2c.trade.seek.service.SeekSalesmanInfoService;
@@ -71,4 +73,22 @@ public class SeekSalesmanInfoController {
         return seekSalesmanInfoService.getMembers();
     }
 
+    /**
+     * 通过型号查询物料信息
+     * @param cmpCode
+     * @return
+     */
+    @RequestMapping(value = "/findByCmpCode", method = RequestMethod.GET)
+    public List<Product> findByCmpCode(String cmpCode) {
+        logger.log("求购", "通过型号查询物料信息");
+        return seekSalesmanInfoService.findByCmpCode(cmpCode);
+    }
+
+    // 通过公共询价id判断是否有业务员跟进
+    @RequestMapping(value = "/getSalesmanByPublicId", method = RequestMethod.GET)
+    public SeekSalesman getSalesmanByPublicId(Long publicId) {
+        logger.log("求购", "通过型号查询物料信息");
+        return seekSalesmanInfoService.getSalesmanByPublicId(publicId);
+    }
+
 }

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekSalesmanInfo.java

@@ -60,6 +60,28 @@ public class SeekSalesmanInfo {
     @Column(name = "id_status")
     private Integer status;
 
+    @Column(name = "id_needquantity")
+    private Double needquantity;
+
+    @Column(name = "ss_id")
+    private Long salesmanId;
+
+    public Long getSalesmanId() {
+        return salesmanId;
+    }
+
+    public void setSalesmanId(Long salesmanId) {
+        this.salesmanId = salesmanId;
+    }
+
+    public Double getNeedquantity() {
+        return needquantity;
+    }
+
+    public void setNeedquantity(Double needquantity) {
+        this.needquantity = needquantity;
+    }
+
     public Integer getStatus() {
         return status;
     }

src/main/java/com/uas/platform/b2c/trade/seek/service/SeekSalesmanInfoService.java

@@ -1,6 +1,8 @@
 package com.uas.platform.b2c.trade.seek.service;
 
 import com.uas.platform.b2c.common.account.model.User;
+import com.uas.platform.b2c.prod.commodity.model.Product;
+import com.uas.platform.b2c.trade.seek.model.SeekSalesman;
 import com.uas.platform.b2c.trade.seek.model.SeekSalesmanInfo;
 import com.uas.platform.b2c.trade.seek.model.SeekSalesmanMember;
 import com.uas.platform.b2c.trade.support.ResultMap;
@@ -10,9 +12,36 @@ import org.springframework.data.domain.Page;
 import java.util.List;
 
 public interface SeekSalesmanInfoService {
+    /**
+     * 获取业务员分配列表
+     * @param info
+     * @param status
+     * @param salesman
+     * @param keyword
+     * @return
+     */
     Page<SeekSalesmanInfo> getPageInfo(PageInfo info, Integer status, String salesman, String keyword);
 
+    /**
+     * 业务员接单
+     * @param id
+     * @param user
+     * @return
+     */
     ResultMap orders(Long id, User user);
 
+    /**
+     * 获取所有的业务员
+     * @return
+     */
     List<SeekSalesmanMember> getMembers();
+
+    /**
+     * 通过型号查询物料信息
+     * @param cmpCode
+     * @return
+     */
+    List<Product> findByCmpCode(String cmpCode);
+
+    SeekSalesman getSalesmanByPublicId(Long publicId);
 }

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekSalesmanInfoServiceImpl.java

@@ -1,6 +1,11 @@
 package com.uas.platform.b2c.trade.seek.service.impl;
 
+import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
+import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
+import com.uas.platform.b2c.prod.commodity.dao.ProductDao;
+import com.uas.platform.b2c.prod.commodity.model.Product;
+import com.uas.platform.b2c.prod.store.dao.StoreInDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekSalesmanDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekSalesmanInfoDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekSalesmanMemberDao;
@@ -47,6 +52,12 @@ public class SeekSalesmanInfoServiceImpl implements SeekSalesmanInfoService {
     @Autowired
     private SeekSalesmanMemberDao seekSalesmanMemberDao;
 
+    @Autowired
+    private ProductDao productDao;
+
+    @Autowired
+    private EnterpriseDao enterpriseDao;
+
     @Override
     public Page<SeekSalesmanInfo> getPageInfo(final PageInfo info, Integer status, String salesman, String keyword) {
         info.sorting("publicDate", Direction.DESC);
@@ -106,11 +117,27 @@ public class SeekSalesmanInfoServiceImpl implements SeekSalesmanInfoService {
         seekSalesman.setPublicId(id);
         seekSalesman.setSalesmanName(user.getUserName());
         seekSalesmanDao.save(seekSalesman);
-        return new ResultMap(CodeType.OK, "接单成功!");
+        return new ResultMap(CodeType.OK.code(), "接单成功!", user);
     }
 
     @Override
     public List<SeekSalesmanMember> getMembers() {
         return seekSalesmanMemberDao.findAll();
     }
+
+    @Override
+    public List<Product> findByCmpCode(String cmpCode) {
+
+        List<Product> productList = productDao.findByCmpCode(cmpCode);
+        for (Product p : productList) {
+            Enterprise enterprise = enterpriseDao.findByUu(p.getEnUU());
+            p.setEnterprise(enterprise);
+        }
+        return productList;
+    }
+
+    @Override
+    public SeekSalesman getSalesmanByPublicId(Long publicId) {
+        return seekSalesmanDao.findByPublicId(publicId);
+    }
 }

src/main/webapp/resources/js/admin/controllers/SeekSalesmanCtrl.js

@@ -13,6 +13,9 @@ define(['app/app'], function (app) {
           param.status = $scope.seek_status;
           param.salesman = $scope.seek_salesman;
           param.keyword = $scope.keyword;
+          if (param.status != 0 || param.salesman != 0 || param.keyword) {
+              $scope.seekSalesmanTableParams.page(1);
+          }
           seekSalesman.getPageInfo(param, function (data) {
           params.total(data.totalElements);
           $defer.resolve(data.content);

src/main/webapp/resources/js/admin/controllers/SeekSalesmanDetailCtrl.js

@@ -1,9 +1,10 @@
 define(['app/app'], function (app) {
     'use strict';
-    app.register.controller('SeekSalesmanDetailCtrl', ['$scope', 'seekSalesman', 'toaster', 'BaseService', '$http', '$stateParams', function ($scope, seekSalesman, toaster, BaseService, $http, $stateParams) {
+    app.register.controller('SeekSalesmanDetailCtrl', ['$scope', 'seekSalesman', 'toaster', 'BaseService', '$http', '$stateParams', '$rootScope', function ($scope, seekSalesman, toaster, BaseService, $http, $stateParams, $rootScope) {
         $scope.active = 'offer';
         $scope.status = 101;
         $scope.salesman_name = $stateParams.name;
+        $scope.userInfo = $rootScope.userInfo;
         //设置状态
         $scope.setActive = function (active) {
             if($scope.active != active) {
@@ -23,6 +24,11 @@ define(['app/app'], function (app) {
                 // $scope.bankInfoTableParams.reload();
             }
         };
+
+        seekSalesman.getSalesmanByPublicId({publicId: $stateParams.uuid}, function (data) {
+            $scope.salesman_name = data.salesmanName;
+        });
+
         seekSalesman.getSeekUrl({}, function(data1) {
             var seekUrl = data1.url;
             $http({
@@ -35,6 +41,10 @@ define(['app/app'], function (app) {
                 seekSalesman.getMallGoodsList({code: data.cmpCode, brand: data.inbrand}, function (data1) {
                     $scope.goods = data1;
                 });
+                seekSalesman.findByCmpCode({cmpCode: data.cmpCode}, function (data2) {
+                    $scope.product = data2;
+                });
+
             }).error(function (response) {
 
             });
@@ -43,8 +53,8 @@ define(['app/app'], function (app) {
         $scope.orders = function(){
             seekSalesman.orders({id: $stateParams.uuid},{}, function(data) {
                 if (data.code == 1) {
+                    $scope.salesman_name = data.data.userName;
                     toaster.pop('success', '提示', '接单成功!');
-                    $scope.seekSalesmanTableParams.reload();
                 } else {
                     toaster.pop('error', '错误', data.message);
                 }

src/main/webapp/resources/js/common/query/seekSalesman.js

@@ -19,6 +19,13 @@ define([ 'ngResource' ], function() {
             }, getSeekUrl: {
                 url: 'seek/accessUrl',
                 method: 'GET'
+            }, findByCmpCode: {
+                url: 'seek/salesman/findByCmpCode',
+                method: 'GET',
+                isArray: true
+            }, getSalesmanByPublicId: {
+                url: 'seek/salesman/getSalesmanByPublicId',
+                method: 'GET'
             }
         });
     }])

src/main/webapp/resources/view/admin/seek_salesman.html

@@ -2,6 +2,11 @@
 .row {
 	margin-bottom: 10px;
 }
+table {
+	table-layout: fixed;
+	word-wrap:break-word;
+}
+
 </style>
 <div>
 	<div class="box-header well">
@@ -29,11 +34,12 @@
 			<thead>
 				<tr class="tr-default">
 					<th width="10%;" class="text-center">编号</th>
-					<th width="7%;" class="text-center">求购来源</th>
+					<th width="10%;" class="text-center">求购来源</th>
 					<th width="10%" class="text-center">询价单号</th>
 					<th width="10%" class="text-center">发布时间</th>
 					<th width="10%" class="text-center">买家</th>
 					<th width="10%" class="text-center">产品信息</th>
+					<th width="10%" class="text-center">采购数量</th>
 					<th width="10%" class="text-center">截止日期</th>
 					<th width="10%" class="text-center">报价条数</th>
 					<th width="10%" class="text-center"><select ng-change="onSearchStatus(seek_status)" ng-model="seek_status">
@@ -62,15 +68,17 @@
 						<p ng-bind="'品牌:'+seek.brand"></p>
 						<p ng-bind="'规格:'+seek.spec"></p>
 					</td>
+					<td><span ng-bind="seek.needquantity || '-'"></span></td>
 					<td><span ng-bind="seek.endDate | date : 'yyyy-MM-dd HH:mm:ss'"></span></td>
 					<td><span ng-bind="seek.offerAmount"></span></td>
 					<td><span ng-if="seek.status && seek.status == 1 && seek.offerAmount > 0">已采纳</span>
 						<span ng-if="(!seek.status || seek.status == 0) && seek.offerAmount > 0">已报价</span>
 						<span ng-if="!seek.offerAmount || seek.offerAmount == 0">待报价</span>
 					</td>
-					<td><span ng-bind="seek.salesman"></span></td>
+					<td><span ng-bind="seek.salesman || '暂无'"></span></td>
 					<td>
 						<button ng-if="!seek.salesman" class="btn btn-sm btn-warning" ng-click="orders(seek.id)">我来接单</button>
+						<br/>
 						<a target="_blank" ng-href="#/seekSalesman/{{seek.id}}/{{seek.salesman}}">
 							查看详情
 						</a>

src/main/webapp/resources/view/admin/seek_salesman_detail.html

@@ -84,65 +84,84 @@
 		<div class="fullscreen" style="padding: 10px;">
 			<div class="col-sm-3 f14">
 				<div class="form-group row">
-					<span class="col-sm-4 text-right">询价单号：</span>
-					<span class="col-sm-6" ng-bind="seek.inquiry.code"></span>
+					<p class="text-center">物料信息</p>
+					<!--<span class="col-sm-6" ng-bind="seek.inquiry.code"></span>-->
 				</div>
-				<div class="form-group row">
-					<span class="col-sm-4 text-right">规格：</span>
-					<span class="col-sm-6" ng-bind="seek.spec"></span>
+				<div class="form-group row" ng-if="seek.cmpCode">
+					<span class="col-sm-5 text-right">型号：</span>
+					<span class="col-sm-6" ng-bind="seek.cmpCode"></span>
 				</div>
-				<div class="form-group row">
-					<span class="col-sm-4 text-right">币种：</span>
-					<span class="col-sm-6" ng-bind="seek.currency"></span>
+				<div class="form-group row" ng-if="seek.inbrand">
+					<span class="col-sm-5 text-right">品牌：</span>
+					<span class="col-sm-6" ng-bind="seek.inbrand"></span>
 				</div>
+				<div class="form-group row" ng-if="seek.product.spec">
+					<span class="col-sm-5 text-right">名称：</span>
+					<span class="col-sm-6" ng-bind="seek.product.spec"></span>
+				</div>
+				<!--<div class="form-group row">-->
+					<!--<span class="col-sm-5 text-right">询价单号：</span>-->
+					<!--<span class="col-sm-6" ng-bind="seek.inquiry.code"></span>-->
+				<!--</div>-->
+				<div class="form-group row" ng-if="seek.product.spec">
+					<span class="col-sm-5 text-right">规格：</span>
+					<span class="col-sm-6" ng-bind="seek.product.spec"></span>
+				</div>
+
 			</div>
 			<div class="col-sm-3 f14">
 				<div class="form-group row">
-					<span class="col-sm-4 text-right">型号：</span>
-					<span class="col-sm-6" ng-bind="seek.cmpCode"></span>
+					<p class="text-center">求购信息</p>
+					<!--<span class="col-sm-6" ng-bind="seek.inquiry.code"></span>-->
 				</div>
 				<div class="form-group row">
-					<span class="col-sm-4 text-right">封装：</span>
-					<span class="col-sm-6" ng-bind="seek.encapsulation"></span>
+					<span class="col-sm-5 text-right">求购状态：</span>
+					<span ng-if="seek.agreed && seek.agreed == 1 && seek.offerAmount > 0" class="col-sm-5" style="color:green;">已采纳</span>
+					<span ng-if="(!seek.agreed || seek.agreed == 0) && seek.offerAmount > 0" class="col-sm-5" style="color:red;">已报价</span>
+					<span ng-if="!seek.offerAmount || seek.offerAmount == 0" class="col-sm-5">待报价</span>
+					<!--<span ng-if="seek.agreed && seek.agreed == 1" class="col-sm-5" style="color:green;">已截至</span>-->
 				</div>
-				<div class="form-group row">
-					<span class="col-sm-4 text-right">生产日期：</span>
-					<span class="col-sm-6" ng-bind="seek.produceDate"></span>
+				<div class="form-group row" ng-if="seek.date">
+					<span class="col-sm-5 text-right">发布日期：</span>
+					<span class="col-sm-6" ng-bind="seek.date | date:'yyyy-MM-dd HH:mm:dd'"></span>
 				</div>
-			</div>
-			<div class="col-sm-3 f14">
-				<div class="form-group row">
-					<span class="col-sm-4 text-right">品牌：</span>
-					<span class="col-sm-6" ng-bind="seek.inbrand"></span>
+				<div class="form-group row" ng-if="seek.endDate">
+					<span class="col-sm-5 text-right">截止日期：</span>
+					<span class="col-sm-6" ng-bind="seek.endDate | date:'yyyy-MM-dd HH:mm:dd'"></span>
 				</div>
-				<div class="form-group row">
-					<span class="col-sm-4 text-right">采购数量：</span>
+				<div class="form-group row" ng-if="seek.needquantity">
+					<span class="col-sm-5 text-right">采购数量：</span>
 					<span class="col-sm-6" ng-bind="seek.needquantity"></span>
 				</div>
-				<div class="form-group row">
-					<span class="col-sm-4 text-right">截止日期：</span>
-					<span class="col-sm-6" ng-bind="seek.endDate | date:'yyyy-MM-dd HH:mm:dd'"></span>
+				<div class="form-group row" ng-if="seek.unitPrice">
+					<span class="col-sm-5 text-right">单价预算：</span>
+					<span class="col-sm-6" ng-bind="seek.unitPrice"></span>
+				</div>
+				<div class="form-group row" ng-if="seek.encapsulation">
+					<span class="col-sm-5 text-right">封装：</span>
+					<span class="col-sm-6" ng-bind="seek.encapsulation"></span>
+				</div>
+				<div class="form-group row" ng-if="seek.produceDate">
+					<span class="col-sm-5 text-right">生产日期：</span>
+					<span class="col-sm-6" ng-bind="seek.produceDate"></span>
+				</div>
+				<div class="form-group row" ng-if="seek.currency">
+					<span class="col-sm-5 text-right">币种：</span>
+					<span class="col-sm-6" ng-bind="seek.currency"></span>
 				</div>
 			</div>
 			<div class="col-sm-3 f14">
 				<div class="form-group row">
-					<span class="col-sm-4 text-right">求购状态：</span>
-					<span ng-if="seek.agreed && seek.agreed == 1 && seek.offerAmount > 0" class="col-sm-4" style="color:green;">已采纳</span>
-					<span ng-if="(!seek.agreed || seek.agreed == 0) && seek.offerAmount > 0" class="col-sm-4" style="color:red;">已报价</span>
-					<span ng-if="!seek.offerAmount || seek.offerAmount == 0" class="col-sm-4">待报价</span>
-					<!--<span ng-if="seek.agreed && seek.agreed == 1" class="col-sm-4" style="color:green;">已截至</span>-->
-				</div>
-				<div class="form-group row">
-					<span class="col-sm-4 text-right">发布日期：</span>
-					<span class="col-sm-6" ng-bind="seek.date | date:'yyyy-MM-dd HH:mm:dd'"></span>
+					<p class="text-center">分配状态</p>
+					<!--<span class="col-sm-6" ng-bind="seek.inquiry.code"></span>-->
 				</div>
 				<div class="form-group row" ng-if="salesman_name">
-					<span class="col-sm-4 text-right">业务员：</span>
+					<span class="col-sm-5 text-right">业务员：</span>
 					<span class="col-sm-6" ng-bind="salesman_name"></span>
 				</div>
 				<div class="form-group row" ng-if="!salesman_name">
-					<span class="col-sm-4 text-right"></span>
-					<button class="btn btn-primary" ng-click="orders()">我来接单</button></p>
+					<span class="col-sm-5 text-right"></span>
+					<button class="btn btn-primary col-sm-5" ng-click="orders()">我来接单</button></p>
 				</div>
 			</div>
 		</div>
@@ -152,13 +171,13 @@
 		</div>
 			<div class="col-sm-3 f14">
 				<div class="form-group row">
-					<span class="col-sm-4 text-right">买家：</span>
-					<span class="col-sm-6" ng-bind="seek.userName + '|' + seek.inquiry.enterprise.enName"></span>
+					<span class="col-sm-5 text-right">买家：</span>
+					<span class="col-sm-6" ng-bind="seek.userName + '&nbsp;&nbsp;|&nbsp;&nbsp;' + seek.inquiry.enterprise.enName"></span>
 				</div>
 			</div>
 			<div class="col-sm-3 f14">
 				<div class="form-group row">
-					<span class="col-sm-4 text-right">电话：</span>
+					<span class="col-sm-5 text-right">电话：</span>
 					<span class="col-sm-6" ng-bind="seek.userTel"></span>
 				</div>
 			</div>
@@ -168,7 +187,7 @@
 			<div class="btn-group" role="group" aria-label="...">
 				<a type="button" class="btn btn-default" ng-class="{'btn-primary': active === 'offer'}" ng-click="setActive('offer')">当前报价({{seek.qutations.length}})</a>
 				<a type="button" class="btn btn-default" ng-class="{'btn-primary': active === 'goods'}" ng-click="setActive('goods')">商城现货({{goods.length}})</a>
-				<a type="button" class="btn btn-default" ng-class="{'btn-primary': active === 'pricing'}" ng-click="setActive('pricing')">核价信息(0)</a>
+				<a type="button" class="btn btn-default" ng-class="{'btn-primary': active === 'pricing'}" ng-click="setActive('pricing')">核价信息({{product.length}})</a>
 			</div>
 		</div>
 	</div>
@@ -189,7 +208,7 @@
 					<td><p ng-bind="qutation.enterprise.enName"></p></td>
 					<td><span ng-bind="qutation.enterprise.enTel"></span></td>
 					<td><span ng-bind="qutation.leadtime"></span></td>
-					<td><p ng-repeat="re in qutation.replies"><span ng-bind="re.lapQty + '+'"></span>|<span ng-bind="qutation.currency + re.price | currencyStr"></span></p></td>
+					<td><p ng-repeat="re in qutation.replies"><span ng-bind="re.lapQty + '+'"></span>&nbsp;&nbsp;|&nbsp;&nbsp;<span ng-bind="qutation.currency + re.price | currencyStr"></span></p></td>
 				</tr>
 			</tbody>
 		</table>
@@ -209,7 +228,7 @@
 				<td><span ng-bind="go.enterpriseName"></span></td>
 				<td><p ng-bind="go.b2cMinDelivery + '-' + go.b2cMaxDelivery"></p></td>
 				<td><p ng-if="go.currencyName == 'RMB'" ng-repeat="p in go.prices">
-					<span ng-bind="p.start + '+'"></span>|<span ng-bind="go.currencyName + p.rMBPrice | currencyStr"></span>
+					<span ng-bind="p.start + '+'"></span>&nbsp;&nbsp;|&nbsp;&nbsp;<span ng-bind="go.currencyName + p.rMBPrice | currencyStr"></span>
 				</p><p ng-if="go.currencyName == 'USD'" ng-repeat="p in go.prices">
 					<span ng-bind="p.start + '+'"></span>|<span ng-bind="go.currencyName + p.uSDPrice | currencyStr"></span>
 				</p></td>
@@ -222,21 +241,19 @@
 		<table  ng-show="status == 103" class="table table-bordered table-striped table-hover" style="word-break:break-all; word-wrap:break-all;">
 			<thead>
 			<tr class="tr-default">
-				<th width="10%;" class="text-center">卖家</th>
-				<th width="20%;" class="text-center">物料编号</th>
-				<th width="10%" class="text-center">物料名称</th>
-				<th width="10%" class="text-center">标记</th>
-				<th width="50%" class="text-center">价格梯度</th>
+				<th width="30%;" class="text-center">卖家</th>
+				<th width="40%;" class="text-center">物料编号</th>
+				<th width="30%" class="text-center">物料名称</th>
+				<!--<th width="10%" class="text-center">标记</th>-->
 			</tr>
 			</thead>
-			<tbody ng-repeat="qutation in seek.qutations">
-			<!--<tr class="text-center">-->
-				<!--<td><span ng-bind="qutation.offerTime | date:'yyyy-MM-dd HH:mm:ss'"></span></td>-->
-				<!--<td><p ng-bind="qutation.enterprise.enName"></p></td>-->
-				<!--<td><span ng-bind="qutation.enterprise.enTel"></span></td>-->
+			<tbody ng-repeat="p in product">
+			<tr class="text-center">
+				<td><span ng-bind="p.enterprise.enName"></span></td>
+				<td><p ng-bind="p.prodNum"></p></td>
+				<td><span ng-bind="p.kind"></span></td>
 				<!--<td><span ng-bind="qutation.leadtime"></span></td>-->
-				<!--<td><p ng-repeat="re in qutation.replies"><span ng-bind="re.lapQty + '+'"></span>|<span ng-bind="qutation.currency + re.price | currencyStr"></span></p></td>-->
-			<!--</tr>-->
+			</tr>
 			</tbody>
 		</table>
 	</div>