Merge branch 'feature/yc-pc_mobile-0516' into dev-mysql

src/main/java/com/uas/platform/b2c/trade/seek/dao/SeekPurchaseBomListDao.java

@@ -14,6 +14,9 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SeekPurchaseBomListDao extends JpaSpecificationExecutor<SeekPurchaseBomList>,
         JpaRepository<SeekPurchaseBomList, Long> {
-
+    /**
+     * 通过BomId删除明细列表
+     */
+    void deleteByBomId(Long bomId);
 }
 

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

@@ -99,7 +99,13 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
 
     private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
-    private int mallColNum = 10;
+    /**
+     * 模板列
+     */
+    private int mallColNum = 6;
+    /**
+     * 上限行数
+     */
     private int mallRowNum = 500;
 
     /**
@@ -109,12 +115,12 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
     public static final int BRANDNUM = 1;
     public static final int DEADLINENUM = 2;
     public static final int AMOUNTNUM = 3;
-    public static final int CURRENCYNUM = 4;
-    public static final int UNITPRICENUM = 5;
-    public static final int ENCAPSULATIONNUM = 8;
-    public static final int PRODUCEDATENUM = 9;
-    public static final int KINDNUM = 6;
-    public static final int SPECNUM = 7;
+//    public static final int CURRENCYNUM = 6;
+//    public static final int UNITPRICENUM = 7;
+//    public static final int ENCAPSULATIONNUM = 8;
+//    public static final int PRODUCEDATENUM = 9;
+    public static final int KINDNUM = 4;
+    public static final int SPECNUM = 5;
 
 
     /**
@@ -192,10 +198,10 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         Object brandCellObj = readWorkBookCell(row.getCell(BRANDNUM), Cell.CELL_TYPE_STRING,
                 0, BRANDNUM);
         String brandString = StringUtilB2C.getStr(brandCellObj);
-        Object produceDateCellObj = readWorkBookCell(row.getCell(PRODUCEDATENUM), Cell.CELL_TYPE_STRING,
-                0, PRODUCEDATENUM);
-        String produceDateString = StringUtilB2C.getStr(produceDateCellObj);
-        if ("只能填数字、英文、英文特殊符号".equals(codeString) || "请勿用中文特殊符号".equals(brandString) || "不超过6个汉字或12个字符".equals(produceDateString)) {
+//        Object produceDateCellObj = readWorkBookCell(row.getCell(PRODUCEDATENUM), Cell.CELL_TYPE_STRING,
+//                0, PRODUCEDATENUM);
+//        String produceDateString = StringUtilB2C.getStr(produceDateCellObj);
+        if ("只能填数字、英文、英文特殊符号".equals(codeString) || "请勿用中文特殊符号".equals(brandString)) {
             return true;
         }
         return false;
@@ -222,14 +228,27 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         if (!"截止时间".equals(StringUtilB2C.getStr(deadlineCellObj))) {
             return false;
         }
-        Object produceDateCellObj = readWorkBookCell(headerRow.getCell(PRODUCEDATENUM), Cell.CELL_TYPE_STRING,
-                0, PRODUCEDATENUM);
-        if (!"生产日期".equals(StringUtilB2C.getStr(produceDateCellObj))) {
-            return false;
-        }
+//        Object produceDateCellObj = readWorkBookCell(headerRow.getCell(PRODUCEDATENUM), Cell.CELL_TYPE_STRING,
+//                0, PRODUCEDATENUM);
+//        if (!"生产日期".equals(StringUtilB2C.getStr(produceDateCellObj))) {
+//            return false;
+//        }
         return true;
     }
 
+
+    private String convert(Object obj, int length) {
+        String result = StringUtilB2C.getStr(obj).trim();
+        try {
+            result = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(result, length);
+            result = match(result);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            result = null;
+        }
+        return result;
+    }
+
     /**
      * 将列信息注入到求购临时实体中
      * @param row
@@ -246,16 +265,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         if (StringUtils.isEmpty(codeValue)) {
             result += 1;
         } else {
-            String code = StringUtilB2C.getStr(codeValue).trim();
-            try {
-                code = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(code, 100);
-                if (!match(code)) {
-                    code = null;
-                }
-            } catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
-            }
-            seekPurchaseByBatch.setCode(code);
+            seekPurchaseByBatch.setCode(convert(codeValue, 100));
         }
 
         // 品牌
@@ -264,16 +274,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         if (StringUtils.isEmpty(brandValue)) {
             result += 1;
         } else {
-            String brand = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(brandValue));
-            try {
-                brand = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(brand, 50);
-                if (!match(brand)) {
-                    brand = null;
-                }
-            } catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
-            }
-            seekPurchaseByBatch.setBrand(brand);
+            seekPurchaseByBatch.setBrand(convert(brandValue, 50));
         }
 
         // 截止日期
@@ -322,90 +323,75 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         }
 
         // 币别
-        Object currencyValue = readWorkBookCell(row.getCell(CURRENCYNUM), Cell.CELL_TYPE_STRING,
-                rowNum, CURRENCYNUM);
-        if (!StringUtils.isEmpty(currencyValue)) {
-            try {
-                String currency = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(currencyValue));
-                seekPurchaseByBatch.setCurrency(currency);
-            } catch (Exception e) {
-                seekPurchaseByBatch.setCurrency(null);
-            }
-        }
+//        Object currencyValue = readWorkBookCell(row.getCell(CURRENCYNUM), Cell.CELL_TYPE_STRING,
+//                rowNum, CURRENCYNUM);
+//        if (!StringUtils.isEmpty(currencyValue)) {
+//            try {
+//                String currency = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(currencyValue));
+//                seekPurchaseByBatch.setCurrency(currency);
+//            } catch (Exception e) {
+//                seekPurchaseByBatch.setCurrency(null);
+//            }
+//        }
 
         // 单价
-        Object unitPriceValue = readWorkBookCell(row.getCell(UNITPRICENUM), Cell.CELL_TYPE_STRING,
-                rowNum, UNITPRICENUM);
-        if (!StringUtils.isEmpty(unitPriceValue)) {
-            try {
-                Double unitPrice = Double.valueOf(StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(unitPriceValue)));
-                if (unitPrice <= 0 || unitPrice >= 10000) {
-                    unitPrice = null;
-                }
-                seekPurchaseByBatch.setUnitPrice(unitPrice);
-            } catch (NumberFormatException e) {
-                seekPurchaseByBatch.setUnitPrice(null);
-            }
-        }
+//        Object unitPriceValue = readWorkBookCell(row.getCell(UNITPRICENUM), Cell.CELL_TYPE_STRING,
+//                rowNum, UNITPRICENUM);
+//        if (!StringUtils.isEmpty(unitPriceValue)) {
+//            try {
+//                Double unitPrice = Double.valueOf(StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(unitPriceValue)));
+//                if (unitPrice <= 0 || unitPrice >= 10000) {
+//                    unitPrice = null;
+//                }
+//                seekPurchaseByBatch.setUnitPrice(unitPrice);
+//            } catch (NumberFormatException e) {
+//                seekPurchaseByBatch.setUnitPrice(null);
+//            }
+//        }
         // 如果填了单价又不选币种，导入的时候系统就默认人民币吧
-        if (!StringUtils.isEmpty(unitPriceValue) && StringUtils.isEmpty(currencyValue)) {
-            seekPurchaseByBatch.setCurrency("RMB");
-        }
+//        if (!StringUtils.isEmpty(unitPriceValue) && StringUtils.isEmpty(currencyValue)) {
+//            seekPurchaseByBatch.setCurrency("RMB");
+//        }
 
         // 封装
-        Object encapsulationValue = readWorkBookCell(row.getCell(ENCAPSULATIONNUM), Cell.CELL_TYPE_STRING,
-                rowNum, ENCAPSULATIONNUM);
-        if (!StringUtils.isEmpty(encapsulationValue)) {
-            try {
-                String encapsulation = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(encapsulationValue));
-                encapsulation = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(encapsulation, 20);
-                seekPurchaseByBatch.setEncapsulation(encapsulation);
-            } catch (Exception e) {
-                seekPurchaseByBatch.setEncapsulation(null);
-            }
-        }
+//        Object encapsulationValue = readWorkBookCell(row.getCell(ENCAPSULATIONNUM), Cell.CELL_TYPE_STRING,
+//                rowNum, ENCAPSULATIONNUM);
+//        if (!StringUtils.isEmpty(encapsulationValue)) {
+//            try {
+//                String encapsulation = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(encapsulationValue));
+//                encapsulation = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(encapsulation, 20);
+//                seekPurchaseByBatch.setEncapsulation(encapsulation);
+//            } catch (Exception e) {
+//                seekPurchaseByBatch.setEncapsulation(null);
+//            }
+//        }
 
 
         // 生产日期
-        Object produceDateValue = readWorkBookCell(row.getCell(PRODUCEDATENUM), Cell.CELL_TYPE_STRING,
-                rowNum, PRODUCEDATENUM);
-        if (!StringUtils.isEmpty(produceDateValue)) {
-            try {
-                String produceDate = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(produceDateValue));
-                produceDate = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(produceDate, 20);
-                seekPurchaseByBatch.setProduceDate(produceDate);
-            } catch (Exception e) {
-                seekPurchaseByBatch.setProduceDate(null);
-            }
-        }
+//        Object produceDateValue = readWorkBookCell(row.getCell(PRODUCEDATENUM), Cell.CELL_TYPE_STRING,
+//                rowNum, PRODUCEDATENUM);
+//        if (!StringUtils.isEmpty(produceDateValue)) {
+//            try {
+//                String produceDate = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(produceDateValue));
+//                produceDate = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(produceDate, 20);
+//                seekPurchaseByBatch.setProduceDate(produceDate);
+//            } catch (Exception e) {
+//                seekPurchaseByBatch.setProduceDate(null);
+//            }
+//        }
 
         // 规格
         Object specValue = readWorkBookCell(row.getCell(SPECNUM), Cell.CELL_TYPE_STRING,
                 rowNum, SPECNUM);
         if (!StringUtils.isEmpty(specValue)) {
-            try {
-                String spec = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(specValue));
-                spec = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(spec, 50);
-                if (!match(spec)) {
-                    spec = null;
-                }
-                seekPurchaseByBatch.setSpec(spec);
-            } catch (Exception e) {
-                seekPurchaseByBatch.setSpec(null);
-            }
+            seekPurchaseByBatch.setSpec(convert(specValue, 50));
         }
 
         // 类目
         Object kindValue = readWorkBookCell(row.getCell(KINDNUM), Cell.CELL_TYPE_STRING,
                 rowNum, KINDNUM);
         if (!StringUtils.isEmpty(kindValue)) {
-            try {
-                String kind = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(kindValue));
-                kind = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(kind, 20);
-                seekPurchaseByBatch.setKind(kind);
-            } catch (Exception e) {
-                seekPurchaseByBatch.setKind(null);
-            }
+            seekPurchaseByBatch.setKind(convert(kindValue, 50));
         }
         return result;
     }
@@ -415,14 +401,14 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
      * @param code
      * @return
      */
-    private boolean match(String code) {
+    private String match(String code) {
         List<String> filterList = Arrays.asList("空", "没", "无", "—", "-", "null", "#N/A");
         for (String s : filterList) {
             if (s.equals(code)){
-                return false;
+                return null;
             }
         }
-        return true;
+        return code;
     }
 
     /**
@@ -588,6 +574,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         }
         // 删除bom的临时数据
         seekPurchaseBomDao.delete(seekPurchaseBom.getId());
+        seekPurchaseBomListDao.deleteByBomId(seekPurchaseBom.getId());
         Map<String, Object> result = new HashMap<>();
         result.put("successAmount", inquiryItems.size());
         result.put("goodsAmount", haveGoodsCount);

src/main/webapp/resources/css/common.css

@@ -970,6 +970,10 @@ select {
 
 
 /*买卖家求购*/
+.seek-purchase .seek-purchase-content >table {
+	table-layout:fixed;
+	margin: 0 auto;
+}
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap {
 	height: 100%;
 	padding-top: 10px;
@@ -988,18 +992,13 @@ select {
 	display: inline-block;
 	float: left;
 }
-.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box .item span {
-	color: #999;
-}
-.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
-	width: 520px;
-}
+
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
 	width: 183px;
 	line-height: 19px;
 	word-break: break-all;
 	white-space: pre-line;
-	margin-right: 75px;
+	margin-right: 13px;
 }
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl.bottom {
 	margin-top: 11px;
@@ -1015,7 +1014,7 @@ select {
 	float: left;
 }
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl.size-middle {
-	width: 136px;
+	width: 200px;
 }
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl.size-middle .content {
 	width: 86px;
@@ -1024,18 +1023,15 @@ select {
 	width: 128px;
 }*/
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-small .item {
-	color: #333;
-	width: 150px;
-	margin-bottom: 8px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
+	color: #f71026;
+	width: 200px;
+	line-height: 100px;
+	text-align: center;
 }
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap .remain {
 	margin-top: 24px;
 }
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap .en-name {
-	width: 226px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;

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

@@ -18,6 +18,9 @@ define(['app/app'], function (app) {
           }
           $scope.initInquiryItem();
 
+            //卖家待报价推送信息，self为与我相关，all为全部
+            $scope.vendorType = 'self';
+
           // 获取当前卖家求购推送列表
           $scope.seekPurchaseTableParams = new ngTableParams({
             pageNumber: 1,
@@ -28,7 +31,6 @@ define(['app/app'], function (app) {
               const param = BaseService.parseParams(params.url());
               // param.deadline = $scope.deadline;
               // param.status = $scope.status;
-              param.enUU = $scope.userInfo.enterprise.uu;
               param.keyword = $scope.keyWord;
               param.fromDate = $scope.startDate
                   ? $scope.startDate.getTime() : null;
@@ -41,10 +43,19 @@ define(['app/app'], function (app) {
                 params.page(1);
                 $scope.isSearch = false;
               }
+              var isSelf = $scope.vendorType == 'self';
+              if (!isSelf) {
+                param.enUU = $scope.userInfo.enterprise.uu;
+                param.userUU = $scope.userInfo.userUU;
+              } else {
+                param.enuu = $scope.userInfo.enterprise.uu;
+                param.useruu = $scope.userInfo.userUU;
+              }
+              var target = isSelf ? '/inquiry/sale/remind' : '/inquiry/public';
               $http({
                 method: 'get',
                 dataType: 'json',
-                url: seekUrl + '/inquiry/public',
+                url: seekUrl + target,
                 params: param
               }).success(function (data) {
                 params.total(data.totalElements);
@@ -56,6 +67,15 @@ define(['app/app'], function (app) {
             }
           });
 
+            // 更换待报价状态
+            $scope.onVendorTypeChange = function () {
+              $scope.keyword = '';
+              $scope.startDate = null;
+              $scope.endDate = null;
+              $scope.seekPurchaseTableParams.page(1);
+              $scope.seekPurchaseTableParams.reload();
+            }
+
           // 搜索
           $scope.onSearch = function () {
             $scope.isSearch = true;
@@ -176,6 +196,9 @@ define(['app/app'], function (app) {
               if (!$scope.inquiryItem.currency) {
                 $scope.inquiryItem.currency = $scope.seekCurrency[0];
               }
+              if ($scope.vendorType == 'self') {
+                  $scope.inquiryItem.id = $scope.inquiryItem.itemId;
+              }
               if (seekUrl == 'https://api-inquiry.usoftmall.com') {
                 seekPurchase.saveOfferProd($scope.inquiryItem, function (data) {
                   toaster.pop('success', '报价成功');

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

@@ -149,7 +149,7 @@
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td.operate-seek >span {
         color: #4290f7;
         cursor: pointer;
-        margin-left: 12px;
+        margin-left: 37px;
         text-align: left;
     }
     .seek-purchase .red-text {
@@ -433,12 +433,9 @@
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap {
         height: 106px;
     }
-    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
-        margin-right: 37px;
-    }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
-        width: 414px;
-        margin-left: 50px;
+        /*width: 414px;*/
+        margin-left: 10px;
     }
     .seek-purchase .sharecode {
         /*position: absolute;*/
@@ -633,9 +630,11 @@
         <table ng-table="seekPurchaseTableParams">
             <thead>
             <tr>
-                <th width="102">发布时间</th>
-                <th width="650">产品信息</th>
-                <th width="112">截止时间</th>
+                <th width="110">发布时间</th>
+                <th width="220">类目/品牌</th>
+                <th width="220">型号/规格</th>
+                <th width="200">采购数量(PCS)</th>
+                <th width="120">截止时间</th>
                 <th width="136">状态</th>
                     <!--
                     <select class="select-adder form-control" ng-model="searchStatus" ng-change="onSearch(searchStatus)">
@@ -664,15 +663,25 @@
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
                             <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</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 size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                        </div>
+                    </div>
+                </td>
+                <td>
+                    <div class="row-wrap il-content">
+                        <div class="il-box-large il-box">
+                            <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
                             <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
                         </div>
+                    </div>
+                </td>
+                <td>
+                    <div class="row-wrap il-content">
                         <div class="il-box-small il-box">
-                            <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
-                            <div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>
-                            <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
-                            <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
+                            <!--<div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
+                            <div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>-->
+                            <div title="{{seek.needquantity}}" class="item">{{seek.needquantity || '-'}}</div>
+                            <!--<div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>-->
                         </div>
                     </div>
                 </td>

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

@@ -23,13 +23,13 @@
         margin: 19px 0 0 0;
     }
     .seek-purchase .seek-purchase-content .publish-purchase .fl .form-block {
-        width: 188px;
+        width: 228px;
         display: inline-block;
         margin-top: 16px;
         position: relative;
     }
     .seek-purchase .seek-purchase-content .publish-purchase .fl .form-block >span {
-        width: 68px;
+        width: 103px;
         height: 24px;
         line-height: 24px;
         display: inline-block;
@@ -71,7 +71,7 @@
     .seek-purchase .seek-purchase-content .publish-purchase .fl .form-block ul.similar-list {
         position: absolute;
         top: 23px;
-        left: 68px;
+        left: 103px;
         background: #fff;
         border: 1px solid #b5b5b5;
         z-index: 1;
@@ -691,12 +691,12 @@
         margin: 18px 0 13px 0;
         border-radius: 2px;
     }
-    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
+   /* .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
         margin-right: 37px;
-    }
+    }*/
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
-        width: 414px;
-        margin-left: 50px;
+        /*width: 414px;*/
+        /*margin-left: 50px;*/
     }
     .seek-purchase .sharecode {
         /*position: absolute;*/
@@ -906,10 +906,10 @@
                     />
                 </div>
                 <div class="form-block">
-                    <span>采购数量</span>
+                    <span>采购数量(PCS)</span>
                     <input type="text" ng-change="onAmountChange()" class="form-group" ng-class="{'error': !validObj.amount}" ng-model="applyObj.amount" ng-blur="checkAmount()" >
                 </div>
-                <div class="form-block single-price">
+               <!-- <div class="form-block single-price">
                     <span>单价预算</span>
                     <select ng-model="applyObj.currency">
                         <option value="RMB">¥</option>
@@ -924,9 +924,9 @@
                 <div class="form-block">
                     <span>生产日期</span>
                     <input type="text" class="form-group" ng-model="applyObj.produceDate" ng-change="onProduceDateChange()">
-                </div>
+                </div>-->
                 <div class="form-block">
-                    <span>类目</span>
+                    <span>类目(产品名称)</span>
                     <input type="text" class="form-group" ng-model="applyObj.prodTitle" ng-change="onProdTitleInput()">
                 </div>
                 <div class="form-block">
@@ -993,9 +993,11 @@
         <table ng-table="seekPurchaseTableParams">
             <thead>
             <tr>
-                <th width="102">发布时间</th>
-                <th width="650">产品信息</th>
-                <th width="112">状态/截止时间</th>
+                <th width="110">发布时间</th>
+                <th width="220">类目/品牌</th>
+                <th width="220">型号/规格</th>
+                <th width="200">采购数量(PCS)</th>
+                <th width="120">状态/截止时间</th>
                 <th width="136">操作</th>
             </tr>
             </thead>
@@ -1011,15 +1013,25 @@
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
                             <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</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 size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                        </div>
+                    </div>
+                </td>
+                <td>
+                    <div class="row-wrap il-content">
+                        <div class="il-box-large il-box">
+                            <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
                             <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
                         </div>
+                    </div>
+                </td>
+                <td>
+                    <div class="row-wrap il-content">
                         <div class="il-box-small il-box">
-                            <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
-                            <div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>
-                            <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
-                            <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
+                            <!--<div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
+                            <div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>-->
+                            <div title="{{seek.needquantity}}" class="item">{{seek.needquantity || '-'}}</div>
+                            <!--<div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>-->
                         </div>
                     </div>
                 </td>

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

@@ -163,13 +163,13 @@
         height: 136px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content {
-        padding-left: 30px;
+        /*padding-left: 30px;*/
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
-        margin-right: 37px;
+        margin-right: 8px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
-        width: 400px;
+        /*width: 400px;*/
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time {
         position: relative;
@@ -663,7 +663,9 @@
             <thead>
             <tr>
                 <th width="178">买家/发布时间</th>
-                <th width="658">产品信息</th>
+                <th width="200">类目/品牌</th>
+                <th width="200">型号/规格</th>
+                <th width="200">采购数量(PCS)</th>
                 <th width="134">剩余时间</th>
                 <th width="88">操作</th>
             </tr>
@@ -682,16 +684,26 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目：</span><div class="content">{{(seek.prodTitle || '-')  | nullStrFilter}}</div></div>
-                            <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                             <div title="{{seek.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                        </div>
+                    </div>
+                </td>
+                <td>
+                    <div class="row-wrap il-content">
+                        <div class="il-box-large il-box">
+                            <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
                             <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
                         </div>
+                    </div>
+                </td>
+                <td>
+                    <div class="row-wrap il-content">
                         <div class="il-box-small il-box">
-                            <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
-                            <div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>
-                            <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
-                            <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
+                            <!--<div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>-->
+                            <!--<div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>-->
+                            <div title="{{seek.needquantity}}" class="item">{{seek.needquantity || '-'}}</div>
+                            <!--<div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>-->
                         </div>
                     </div>
                 </td>

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

@@ -84,10 +84,6 @@
         padding: 6px 6px;
     }
     /*搜索时间筛选 end*/
-    .seek-purchase .seek-purchase-content >table {
-        width: 1000px;
-        margin: 0 auto;
-    }
     .seek-purchase .seek-purchase-content >table thead {
         background: #89aefa;
     }
@@ -115,15 +111,13 @@
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap {
         padding-top: 25px;
         height: 136px;
+        width:178px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content {
-        padding-left: 30px;
+        /*padding-left: 30px;*/
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
-        margin-right: 25px;
-    }
-    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
-        width: 400px;
+        margin-right: 8px;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time {
         position: relative;
@@ -604,6 +598,16 @@
     .oder01 ul li.active:after{
         display: block
     }
+    .vendor-type {
+        display: inline-block;
+        width: 111px;
+        float: left;
+        margin-right: 20px;
+        margin-left: 10px;
+        text-align: center;
+        border: 1px solid #4290f7;
+        color: #333;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -650,6 +654,11 @@
                 -->
             </div>
             <div class="sreach fr">
+                <span>求购筛选</span>
+                <select class="form-control select-adder vendor-type" ng-model="vendorType" ng-change="onVendorTypeChange(vendorType)">
+                    <option value="self">推荐询价</option>
+                    <option value="all">全部</option>
+                </select>
                 <span>发布时间&nbsp;</span>
                 <div class="date fl">
                     <div class="data-input">
@@ -688,7 +697,9 @@
             <thead>
                 <tr>
                     <th width="178">买家/发布时间</th>
-                    <th width="658">产品信息</th>
+                    <th width="200">类目/品牌</th>
+                    <th width="200">型号/规格</th>
+                    <th width="200">采购数量(PCS)</th>
                     <th width="134">剩余时间</th>
                     <th width="88">操作</th>
                 </tr>
@@ -708,15 +719,25 @@
                         <div class="row-wrap il-content">
                             <div class="il-box-large il-box">
                                 <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</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 size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                            </div>
+                        </div>
+                    </td>
+                    <td>
+                        <div class="row-wrap il-content">
+                            <div class="il-box-large il-box">
+                                <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
                                 <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
                             </div>
+                        </div>
+                    </td>
+                    <td>
+                        <div class="row-wrap il-content">
                             <div class="il-box-small il-box">
-                                <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
-                                <div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>
-                                <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
-                                <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
+                                <!--<div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>-->
+                                <!--<div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>-->
+                                <div title="{{seek.needquantity}}" class="item">{{seek.needquantity || '-'}}</div>
+                                <!--<div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>-->
                             </div>
                         </div>
                     </td>
@@ -725,14 +746,14 @@
                     <td class="left-time" ng-if="seek.remainingTime == null"><span>-</span></td>
                     <td class="operate">
                         <!--<a ng-click="setLinkBoxIndex($index)">联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>-->
-                        <div ng-if="userInfo.enterprise.uu != seek.inquiry.enUU && seek.quoted != 1 && seek.remainingTime > 0" ng-click="setSeekActive(seek, true, index)">我要报价</div>
+                        <div ng-if="!seek.newId && userInfo.enterprise.uu != seek.inquiry.enUU && seek.quoted != 1 && seek.remainingTime > 0" ng-click="setSeekActive(seek, true, index)">我要报价</div>
                         <div class="disable" ng-if="userInfo.enterprise.uu == seek.inquiry.enUU && seek.quoted != 1 && seek.remainingTime > 0" title="此为贵公司的求购" ng-disabled="true">我要报价</div>
-                        <span ng-if="seek.quoted == 1">已报价 <img src="static/img/seekPurchase/check.png" alt=""></span>
+                        <span ng-if="seek.quoted == 1 || seek.newId">已报价 <img src="static/img/seekPurchase/check.png" alt=""></span>
                         <!--<img ng-if="seek.quoted == 1" src="static/img/seekPurchase/recieved.png" alt="">-->
                     </td>
                 </tr>
             </tbody>
-            <tbody ng-if="seekListData.length == 0">
+            <tbody ng-if="!seekListData.length || seekListData.length== 0">
                 <tr class="empty">
                     <td colspan="10">
                         <div>

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

@@ -342,6 +342,14 @@
 	.pro_management .table .check-active label {
 		margin-right: 0 !important;
 	}
+	.check-input {
+		position: relative;
+	}
+	.check-input img {
+		position: absolute;
+		left: 0;
+		top: 0;
+	}
 	.check-input input{
 		display: none;
 	}
@@ -1940,6 +1948,7 @@
 					<!--<tr ng-class="{ 'active': material.selected }" class="gre-bg">-->
 					<tr ng-class="{ 'active': material.selected, 'gre-bg' : material.exPandOper}">
 						<td class="check-input">
+							<img src="static/img/vendor/images/person-material-pc.png" ng-if="material.addProductPerson" alt="">
 							<span><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>
 						</td>
 						<td>

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

@@ -2295,7 +2295,7 @@
 						<img src="static/img/all/empty-cart.png">
 					</p>
 					<div class="empty-info">
-						<p class="grey"> 创建您的个人产品库，可为您精准推送客户需求 </p>
+						<p class="grey"> 上传物料至个人物料库，可获得更多的商机哦！ </p>
 						<a href="vendor#/vendor_upload?type=self"><i></i>马上去上传</a>
 					</div>
 				</div>

src/main/webapp/resources/view/vendor/left_nav.html

@@ -60,7 +60,7 @@
 				<!-- 我的店铺申述 store -->
 				<span  ui-sref="vendor_store_maintain" ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</span>
 			</li>
-			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ui-sref="vendorSeekPurchase">求购询价</span></li>
+			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ui-sref="vendorSeekPurchase">我的商机</span></li>
 		<li ng-class="{'active' : active == 'vendor_logistics'}">
 			<span  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</span>
 			<span  ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</span>
@@ -96,7 +96,7 @@
 				<!-- 我的店铺申述 store -->
 				<span ng-click="promptUpdate()" class="disabled"  ng-if="store && store.status && store.status !== 'OPENED'">店铺管理</span>
 			</li>
-			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ng-click="promptUpdate()" class="disabled">求购询价</span></li>
+			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ng-click="promptUpdate()" class="disabled">我的商机</span></li>
 			<li ng-class="{'active' : active == 'vendor_logistics'}"><span ng-click="promptUpdate()" class="disabled">物流管理</span></li>
 			<li ng-class="{'active' : active == 'vendor_invoice'}"><span ng-click="promptUpdate()" class="disabled" >发票管理</span></li>
 			<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><span  ui-sref="vendor_logistics">物流管理</span></li>-->