平台针对公共询价UI交互限制等，查询客户询价报价信息

src/main/java/com/uas/platform/b2b/controller/PubInquiryController.java

@@ -444,7 +444,7 @@ public class PubInquiryController {
      * @return
      */
     @RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
-    public List<PublicInquiryItemInfo> getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
+    public PublicInquiryItem getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) throws Exception {
         logger.log("公共询价单", "查看详情", "查看[" + id + "]的详情");
         return pubInquiryService.findById(id);
     }

src/main/java/com/uas/platform/b2b/controller/PubInquiryForPurcController.java

@@ -352,7 +352,7 @@ public class PubInquiryForPurcController {
      * @return
      */
     @RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
-    public InquiryDetailInfo getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
+    public InquiryDetailInfo getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) throws Exception {
         logger.log("公共询价", "查询公共询价明细", "关联id： " + id);
         return pubInquiryService.getInquiryDetail(id);
     }

src/main/java/com/uas/platform/b2b/mobile/controller/AppPubInquiryController.java

@@ -433,7 +433,8 @@ public class AppPubInquiryController {
     @RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
     public List<PublicInquiryItemInfo> getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
         logger.log("公共询价单", "查看详情", "查看[" + id + "]的详情");
-        return pubInquiryService.findById(id);
+//        return pubInquiryService.findById(id);
+        return null;
     }
 
     /**

src/main/java/com/uas/platform/b2b/ps/InquiryUtils.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.parser.Feature;
 import com.uas.account.support.Page;
 import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.temporary.model.InquiryDetailInfo;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -23,7 +24,7 @@ public class InquiryUtils {
     /**
      * 访问地址
      */
-    private static String url = "http://192.168.253.192:8080";
+    private static String url = "http://218.17.158.219:24000/inquiry";
 
     /**
      * 传递数据到公共询价接口方法
@@ -191,8 +192,9 @@ public class InquiryUtils {
      * @throws Exception
      */
     public static PublicInquiryItem findInquiryById(Long id, Long enuu) throws Exception {
-        JSONObject formData = JSON.parseObject(JSON.toJSONString(id));
-        formData.putAll(JSON.parseObject(JSON.toJSONString(enuu)));
+        JSONObject formData = new JSONObject();
+        formData.put("id", id);
+        formData.put("enuu", enuu);
         HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/sale/inquiry/detail", formData);
         if (res.getStatusCode() == 200) {
             if (null != res.getResponseText()) {
@@ -224,4 +226,27 @@ public class InquiryUtils {
         return (Page)JSONObject.parseObject(res.getResponseText(), new TypeReference<Page<PublicInquiryItemInfo>>() {
         }, new Feature[0]);
     }
+
+    /**
+     * 针对买家查询客户的报价信息
+     *
+     * @param id 报价主表id
+     * @param enuu 企业UU
+     * @return
+     * @throws Exception
+     */
+    public static InquiryDetailInfo getQutation(Long id, Long enuu) throws Exception {
+        JSONObject formData = new JSONObject();
+        formData.put("id", FlexJsonUtils.toJsonDeep(id));
+        formData.put("enuu", FlexJsonUtils.toJsonDeep(enuu));
+        HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/buyer/detail", formData);
+        if (res.getStatusCode() == 200) {
+            if (null != res.getResponseText()) {
+                return JSONObject.parseObject(res.getResponseText(), InquiryDetailInfo.class);
+            }
+        } else {
+            throw new Exception("数据查询失败： " + res.getStatusCode());
+        }
+        return null;
+    }
 }

src/main/java/com/uas/platform/b2b/service/PubInquiryService.java

@@ -39,10 +39,10 @@ public interface PubInquiryService {
     /**
      * 根据询价的id查询询价详情
      *
-     * @param id 询价单id
+     * @param id 询价单明细id
      * @return
      */
-    List<PublicInquiryItemInfo> findById(Long id);
+    PublicInquiryItem findById(Long id) throws Exception;
 
     /**
      * 通过明细id查询报价历史
@@ -74,7 +74,7 @@ public interface PubInquiryService {
      * @param id 公共询价主表id
      * @return
      */
-    InquiryDetailInfo getInquiryDetail(Long id);
+    InquiryDetailInfo getInquiryDetail(Long id) throws Exception;
 
     /**
      * 采纳供应商报价信息

src/main/java/com/uas/platform/b2b/service/impl/PubInquiryServiceImpl.java

@@ -360,8 +360,9 @@ public class PubInquiryServiceImpl implements PubInquiryService {
      * @return
      */
     @Override
-    public List<PublicInquiryItemInfo> findById(Long id) {
-        return publicInquiryItemInfoDao.findByVendUUAndInquiry(SystemSession.getUser().getEnterprise().getUu(), id);
+    public PublicInquiryItem findById(Long id) throws Exception {
+//        return publicInquiryItemInfoDao.findByVendUUAndInquiry(SystemSession.getUser().getEnterprise().getUu(), id);
+        return InquiryUtils.findInquiryById(id, SystemSession.getUser().getEnterprise().getUu());
     }
 
     /**
@@ -465,63 +466,63 @@ public class PubInquiryServiceImpl implements PubInquiryService {
      * @return
      */
     @Override
-    public InquiryDetailInfo getInquiryDetail(Long id) {
-        PublicInquiryInfo inquiry = publicInquiryInfoDao.findOne(id);
-        InquiryDetailInfo inquiryInfo = new InquiryDetailInfo();
-        if (inquiry != null) {
-            inquiryInfo.setAttachs(inquiry.getAttachs());
-            inquiryInfo.setAuditor(inquiry.getAuditor());
-            inquiryInfo.setCheck(inquiry.getCheck());
-            inquiryInfo.setCode(inquiry.getCode());
-            inquiryInfo.setDate(inquiry.getDate());
-            inquiryInfo.setEndDate(inquiry.getEndDate());
-            inquiryInfo.setEnterprise(inquiry.getEnterprise());
-            inquiryInfo.setEnUU(inquiry.getEnUU());
-            inquiryInfo.setEnvironment(inquiry.getEnvironment());
-            inquiryInfo.setId(inquiry.getId());
-            inquiryInfo.setIsOpen(inquiry.getIsOpen());
-            inquiryInfo.setOverdue(inquiry.getOverdue());
-            inquiryInfo.setPriceType(inquiry.getPriceType());
-            inquiryInfo.setRecorder(inquiry.getRecorder());
-            inquiryInfo.setRecorderUU(inquiry.getRecorderUU());
-            inquiryInfo.setRemark(inquiry.getRemark());
-            inquiryInfo.setSourceApp(inquiry.getSourceApp());
-            inquiryInfo.setSourceId(inquiry.getSourceId());
-            inquiryInfo.setShip(inquiry.getShip());
-            inquiryInfo.setInvoice(inquiry.getInvoice());
-            inquiryInfo.setInquirytype(inquiry.getInquirytype());
-            Set<Long> ids = new HashSet<Long>();
-            List<Long> idList = new ArrayList<>();
-            Set<InquiryProductInfo> products = new HashSet<InquiryProductInfo>();
-            if (!CollectionUtils.isEmpty(inquiry.getInquiryItems())) {
-                for (PublicInquiryItemInfo item : inquiry.getInquiryItems()) {
-                    idList.add(item.getProductId());
-                    ids.addAll(idList);
-                }
-            }
-            if (!CollectionUtils.isEmpty(ids)) {
-                for (Long idInfo : ids) {
-                    InquiryProductInfo productInfo = new InquiryProductInfo();
-                    Set<PublicInquiryItemInfo> items = new HashSet<PublicInquiryItemInfo>();
-                    Product product = productDao.findOne(idInfo);
-                    productInfo.setBrand(product.getBrand());
-                    productInfo.setId(product.getId());
-                    productInfo.setSpec(product.getSpec());
-                    productInfo.setCode(product.getCode());
-                    productInfo.setTitle(product.getTitle());
-                    productInfo.setUnit(product.getUnit());
-                    for (PublicInquiryItemInfo item : inquiry.getInquiryItems()) {
-                        if (item.getProductId().equals(idInfo)) {
-                            items.add(item);
-                        }
-                    }
-                    productInfo.setPublicInquiryItemInfos(items);
-                    products.add(productInfo);
-                    inquiryInfo.setProducts(products);
-                }
-            }
-        }
-        return inquiryInfo;
+    public InquiryDetailInfo getInquiryDetail(Long id) throws Exception {
+//        PublicInquiryInfo inquiry = publicInquiryInfoDao.findOne(id);
+//        InquiryDetailInfo inquiryInfo = new InquiryDetailInfo();
+//        if (inquiry != null) {
+//            inquiryInfo.setAttachs(inquiry.getAttachs());
+//            inquiryInfo.setAuditor(inquiry.getAuditor());
+//            inquiryInfo.setCheck(inquiry.getCheck());
+//            inquiryInfo.setCode(inquiry.getCode());
+//            inquiryInfo.setDate(inquiry.getDate());
+//            inquiryInfo.setEndDate(inquiry.getEndDate());
+//            inquiryInfo.setEnterprise(inquiry.getEnterprise());
+//            inquiryInfo.setEnUU(inquiry.getEnUU());
+//            inquiryInfo.setEnvironment(inquiry.getEnvironment());
+//            inquiryInfo.setId(inquiry.getId());
+//            inquiryInfo.setIsOpen(inquiry.getIsOpen());
+//            inquiryInfo.setOverdue(inquiry.getOverdue());
+//            inquiryInfo.setPriceType(inquiry.getPriceType());
+//            inquiryInfo.setRecorder(inquiry.getRecorder());
+//            inquiryInfo.setRecorderUU(inquiry.getRecorderUU());
+//            inquiryInfo.setRemark(inquiry.getRemark());
+//            inquiryInfo.setSourceApp(inquiry.getSourceApp());
+//            inquiryInfo.setSourceId(inquiry.getSourceId());
+//            inquiryInfo.setShip(inquiry.getShip());
+//            inquiryInfo.setInvoice(inquiry.getInvoice());
+//            inquiryInfo.setInquirytype(inquiry.getInquirytype());
+//            Set<Long> ids = new HashSet<Long>();
+//            List<Long> idList = new ArrayList<>();
+//            Set<InquiryProductInfo> products = new HashSet<InquiryProductInfo>();
+//            if (!CollectionUtils.isEmpty(inquiry.getInquiryItems())) {
+//                for (PublicInquiryItemInfo item : inquiry.getInquiryItems()) {
+//                    idList.add(item.getProductId());
+//                    ids.addAll(idList);
+//                }
+//            }
+//            if (!CollectionUtils.isEmpty(ids)) {
+//                for (Long idInfo : ids) {
+//                    InquiryProductInfo productInfo = new InquiryProductInfo();
+//                    Set<PublicInquiryItemInfo> items = new HashSet<PublicInquiryItemInfo>();
+//                    Product product = productDao.findOne(idInfo);
+//                    productInfo.setBrand(product.getBrand());
+//                    productInfo.setId(product.getId());
+//                    productInfo.setSpec(product.getSpec());
+//                    productInfo.setCode(product.getCode());
+//                    productInfo.setTitle(product.getTitle());
+//                    productInfo.setUnit(product.getUnit());
+//                    for (PublicInquiryItemInfo item : inquiry.getInquiryItems()) {
+//                        if (item.getProductId().equals(idInfo)) {
+//                            items.add(item);
+//                        }
+//                    }
+//                    productInfo.setPublicInquiryItemInfos(items);
+//                    products.add(productInfo);
+//                    inquiryInfo.setProducts(products);
+//                }
+//            }
+//        }
+        return InquiryUtils.getQutation(id, SystemSession.getUser().getEnterprise().getUu());
     }
 
     /**
@@ -597,7 +598,7 @@ public class PubInquiryServiceImpl implements PubInquiryService {
         }
         item.setAttaches(attachSet);
 //        item = publicInquiryItemDao.save(item);
-        item = InquiryUtils.saveItem(item);
+        item = InquiryUtils.save(item);
         map.put("success", true);
         map.put("item", item);
         return map;

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

@@ -5289,6 +5289,21 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             return new Date();
         };
 
+        $scope.isOverDue = function (date) {
+            if (date) {
+                var ndate = new Date();
+                ndate.setHours(23, 59, 59 ,999);
+                ndate.setDate(ndate.getDate());
+                var timestamp = Date.parse(ndate);
+                if (date > timestamp) {
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                return true;
+            }
+        }
         // 选择查找日期
         $scope.onDateCondition = function () {
             $scope.tableParams.page(1);
@@ -5475,26 +5490,27 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 保存报价信息
         $scope.save = function(inquiryItem, method) {
-            var file = $scope.myFiles, file = file && file.length > 0 ? file[0] : null;// 可以不传附件
-            $upload.upload({
-                url: 'pubInquiry/turnToQuotation',
-                file: file,
-                method: 'POST',
-                data: {
-                    item: inquiryItem,
-                    method: method
-                }
-            }).success(function (data) {
-                if (data.item) {
-                    item = data.item;
-                }
-                $scope.loading = false;
-                toaster.pop('info', '提示', '报价成功');
-                $modalInstance.close();
-            }).error(function (data) {
-                $scope.loading = false;
-                toaster.pop('error', '附件上传失败');
-            });
+            console.log(inquiryItem);
+            // var file = $scope.myFiles, file = file && file.length > 0 ? file[0] : null;// 可以不传附件
+            // $upload.upload({
+            //     url: 'pubInquiry/turnToQuotation',
+            //     file: file,
+            //     method: 'POST',
+            //     data: {
+            //         item: inquiryItem,
+            //         method: method
+            //     }
+            // }).success(function (data) {
+            //     if (data.item) {
+            //         item = data.item;
+            //     }
+            //     $scope.loading = false;
+            //     toaster.pop('info', '提示', '报价成功');
+            //     $modalInstance.close();
+            // }).error(function (data) {
+            //     $scope.loading = false;
+            //     toaster.pop('error', '附件上传失败');
+            // });
         }
 
         $scope.previewShow = false;
@@ -5525,6 +5541,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.pdfShow = false;
             }
         });
+
         //建立一个可存取到该file的url
         var imgurl = null;
         var getObjectURL = function (file) {
@@ -23325,19 +23342,18 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
      */
     app.controller('SalePubInquiryDetailCtrl', ['$scope', '$stateParams', 'PurcInquiry', '$filter', 'toaster', '$upload', 'token', 'CurrentRole', 'publicInquiry', function ($scope, $stateParams, PurcInquiry, $filter, toaster, $upload, token, CurrentRole, publicInquiry) {
         // 获取当前用户是否为普通用户
-        CurrentRole.isUser({}, {}, function (data) {
-            $scope.isUser = data.isUser;
-        });
-
         var loadData = function () {
             publicInquiry.inquiryDetail({id: $stateParams.id}, function (data) {
-                $scope.newinquiryItems = data;
-                var inquiry = data[0].inquiry;
-                //inquiry.inquiryItems = data;
+                $scope.inquiryItem = data;
+                var inquiry = data.inquiry;
                 angular.forEach(inquiry.attachs, function (attach) {
                     attach.type = attach.name.substr(attach.name.lastIndexOf('.') + 1);
                 });
                 $scope.inquiry = inquiry;
+                $scope.attach = null;
+                if ($scope.inquiryItem.attaches.length > 0) {
+                    $scope.attach = $scope.inquiryItem.attaches[0];
+                }
             }, function (response) {
                 $scope.loading = false;
                 toaster.pop('error', '', response.data);
@@ -23419,15 +23435,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             return bool;
         };
 
-        // 获取token信息
-        $scope.getToken = function() {
-            token.info({userType: 'salePubInquiry'}, {}, function(data) {
-                $scope.token = data.token;
-            }, function(response) {
-                toaster.pop('error', '提示', response.data);
-            });
-        };
-
         $scope.deleteAttach = function (attaches, index) {
             attaches.splice(index, 1);
         };

src/main/webapp/resources/js/index/services/PublicInquiry.js

@@ -20,8 +20,7 @@ define([ 'ngResource'], function() {
              */
             inquiryDetail: {
                 url: 'sale/pubInquiry/:id/info',
-                method: 'GET',
-                isArray: true
+                method: 'GET'
             },
             /**
              * 卖家对公共询价单进行报价

src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -766,6 +766,6 @@ input[type="radio"], input[type="checkbox"] {
         </tbody>
     </table>
     <div class="footer">
-        <button class="btn">我要报价</button>
+        <button class="btn" ng-click="transtoInquiry(inquiryItem.id)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || nowdate > inquiryItem.toDate" ng-hide="inquiryItem.overdue == 1" title="如果询价单已过期，将无法进入报价">我要报价</button>
     </div>
 </div>

src/main/webapp/resources/tpl/index/baseInfo/inquiry_list.html

@@ -397,7 +397,10 @@
                                         <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.needquantity"></td>
                                         <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.inquiry.enterprise.enName"><a></a></td>
                                         <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.inquiry.endDate| date: 'yyyy-MM-dd'"></td>
-                                        <td><a class="offer" ng-click="transtoInquiry(inquiryItem)">我要报价</a></td>
+                                        <td>
+                                            <a class="offer"ng-click="transtoInquiry(inquiryItem)" ng-if="isOverDue(inquiryItem.inquiry.endDate)">我要报价</a>
+                                            <a class="offer" ng-if="!isOverDue(inquiryItem.inquiry.endDate)" ng-click="">已过期</a>
+                                        </td>
                                     </tr>
                                </tbody>
                                <tbody ng-if="active == 'teams'">

src/main/webapp/resources/tpl/index/baseInfo/modal/quotation_modal.html

@@ -132,13 +132,13 @@
 <div class="modal-header">
     <span>报价详情</span>
 </div>
-<div class="modal-body">
+<form class="modal-body" name="Form">
     <div class="row">
         <div class="col-xs-6 form-horizontal">
             <div class="form-group">
                 <label for="inputEmail3" class="col-xs-4 control-label">最小订购</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail3" placeholder="1000" ng-model="inquiryItem.minOrderQty">
+                    <input type="text" class="form-control" id="inputEmail3" placeholder="1000" ng-model="inquiryItem.minOrderQty" ng-pattern="/^[1-9]*$/">
                 </div>
             </div>
         </div>
@@ -146,7 +146,7 @@
             <div class="form-group">
                 <label for="inputEmail1" class="col-xs-4 control-label">最小包装</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail1" placeholder="1000" ng-model="inquiryItem.minPackQty">
+                    <input type="text" class="form-control" id="inputEmail1" placeholder="1000" ng-model="inquiryItem.minPackQty" ng-pattern="/^[1-9]*$/">
                 </div>
             </div>
         </div>
@@ -154,7 +154,7 @@
             <div class="form-group">
                 <label for="inputEmail2" class="col-xs-4 control-label">交货周期（天）</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail2" placeholder="20" ng-model="inquiryItem.leadtime">
+                    <input type="text" class="form-control" id="inputEmail2" placeholder="20" ng-model="inquiryItem.leadtime" ng-pattern="/^[1-9]*$/">
                 </div>
             </div>
         </div>
@@ -173,7 +173,7 @@
             <div class="form-group">
                 <label for="inputEmail4" class="col-xs-4 control-label">税率（%）</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail4" placeholder="10" ng-model="inquiryItem.taxrate">
+                    <input type="text" class="form-control" id="inputEmail4" placeholder="10" ng-model="inquiryItem.taxrate" ng-pattern="/^(([0-9]+\.[0-9]{1,3})|([0-9]*[1-9][0-9]*\.[0-9]{1,3})|([0-9]*[1-9][0-9]*)|100)$/">
                 </div>
             </div>
         </div>
@@ -192,7 +192,7 @@
                 <label for="inputEmail6" class="col-xs-4 control-label">分段数量
                     <span ng-bind="$index + 1" ng-if="inquiryItem.replies.length > 1"></span></label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail6" ng-model="reply.lapQty">
+                    <input type="text" class="form-control" id="inputEmail6" ng-model="reply.lapQty" ng-pattern="/^[1-9]*$/" ng-required="true">
                 </div>
             </div>
         </div>
@@ -201,7 +201,7 @@
                 <label for="inputEmail7" class="col-xs-4 control-label">价格
                     <span ng-bind="$index + 1" ng-if="inquiryItem.replies.length > 1"></span></label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail7" ng-model="reply.price">
+                    <input type="text" class="form-control" id="inputEmail7" ng-model="reply.price" ng-pattern="/^(([0-9]+\.[0-9]{1,3})|([0-9]*[1-9][0-9]*\.[0-9]{1,3})|([0-9]*[1-9][0-9]*))$/" ng-required="true">
                 </div>
             </div>
         </div>
@@ -210,7 +210,7 @@
     <div class="modal-file" ng-if="imgPreviewName">
         <span>附件：</span><a ng-bind="imgPreviewName" style="margin-left:10px;"></a>
     </div>
-</div>
+</form>
 <div class="modal-body">
     <div class="bottom">
         <span ng-click="addStep(inquiryItem)"><i class="fa fa-plus"></i>增加分段数量和分段报价</span>
@@ -222,8 +222,8 @@
 </div>
 <div class="modal-footer">
     <span>确认报价后，将无法修改</span>
-    <button ng-click="save(inquiryItem, 'reply')">确认报价</button>
-    <button ng-click="save(inquiryItem, 'save')">保存</button>
+    <button ng-click="save(inquiryItem, 'reply')" ng-disabled="Form.$invalid">确认报价</button>
+    <!--<button ng-click="save(inquiryItem, 'save')" ng-disabled="Form.$invalid">保存</button>-->
     <button ng-click="cancel()">取消</button>
 </div>
 </div>

src/main/webapp/resources/tpl/index/purc/pubInquiry_detail.html

@@ -504,13 +504,13 @@ i, em {
                                     <span>有效期</span>
                                     <span>操作</span>
                                 </dt>
-                                <dd ng-repeat = "inquiryItem in product.publicInquiryItemInfos">
+                                <dd ng-repeat = "inquiryItem in product.inquiryItems">
                                     <span class="wid01">{{inquiryItem.enterprise.enName}}
                                     </span>
                                     <span class="prod-number">{{inquiryItem.currency}}</span>
                                     <span class="prod-number">{{inquiryItem.taxrate || 0}}</span>
                                     <span class="wid02">
-                                    	<div class="dropdown" ng-if="::inquiryItem.replies.length > 1">
+                                    	<div class="dropdown" ng-if="inquiryItem.replies.length > 1">
 											<a href="javascript:void(0);"
 												class="dropdown-toggle text-default">报价信息<i class="fa fa-fw fa-angle-down"></i></a>
 											<div class="dropdown-menu pane" style="width: 270px;">
@@ -518,7 +518,7 @@ i, em {
 													<ul class="list-unstyled list-menu">
 															<div ng-class="{'text-inverse': $index==0}">
 																<div class="row row-sm"
-																	ng-repeat="reply in ::inquiryItem.replies">
+																	ng-repeat="reply in inquiryItem.replies">
 																	<div class="col-xs-5">≥{{reply.lapQty}}</div>
 																	<div class="col-xs-5">价格{{isUser?'-':(reply.price | number:6)}}</div>
 																</div>
@@ -529,14 +529,14 @@ i, em {
 												</div>
 											</div>
 										</div>
-										<div  ng-if="::inquiryItem.replies.length == 1">
+										<div  ng-if="inquiryItem.replies.length == 1">
 											<div class="row row-sm"
 												ng-repeat="reply in ::inquiryItem.replies">
 												<div class="col-xs-5">≥{{reply.lapQty}}</div>
 												<div class="col-xs-5">{{isUser?'-':(reply.price | number:6)}}</div>
 											</div>
 										</div>
-										<div  ng-if="::inquiryItem.replies.length == 0">暂无报价信息</div>
+										<div  ng-if="inquiryItem.replies.length == 0">暂无报价信息</div>
                                     </span>
                                     <span class="prod-number">{{inquiryItem.leadtime|| '无'}}</span>
                                     <span class="prod-number">{{inquiryItem.minOrderQty|| '无'}}</span>

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -313,7 +313,7 @@
 					<span
 							ng-bind="::inquiryItem.inquiry.enterprise.enName"></span>
 					<span>流水号：<a title="查看详情"
-						class="text-num order-detail" ng-bind="::inquiryItem.inquiry.code" ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})" target="_self"
+						class="text-num order-detail" ng-bind="::inquiryItem.inquiry.code" ui-sref="sale.inquiry_detail({id:inquiryItem.id})" target="_self"
 						ng-click="setOrdersRead(inquiryItem.id)"></a>
 					</span>
 				</div>

src/main/webapp/resources/tpl/index/sale/pubinquiry_detail.html

@@ -130,8 +130,8 @@
 	<div class="top">
 		<h3>客户公共询价单</h3>
 		<div class="top-right">
-			<span>日期：<em ng-bind="inquiry.date | date:'yyyy-MM-dd'">2017-11-11</em></span>
-			<span>报价单号：<em ng-bind="::inquiry.code">2017-11-11</em></span>
+			<span>日期：<em ng-bind="inquiry.date | date:'yyyy-MM-dd'"></em></span>
+			<span>报价单号：<em ng-bind="::inquiry.code"></em></span>
 		</div>
 	</div>
 	<div class="middle">
@@ -167,7 +167,7 @@
 				<th>附件</th>
 			</tr>
 		</thead>
-		<tbody ng-repeat="inquiryItem in newinquiryItems | orderBy:'number'">
+		<tbody>
 			<tr>
 				<td>
 					<div class="info">
@@ -209,7 +209,7 @@
 					<span ng-bind="inquiryItem.minPackQty ? inquiryItem.minPackQty : '-'"></span>
 				</td>
 				<td>
-					<a href="javescript:void(0)">dsafsa.paf</a>
+					<a href="attach.path"><span ng-if="attach != null" ng-bind="attach.name"></span></a>
 				</td>
 			</tr>
 		</tbody>