Merge remote-tracking branch 'origin/dev' into dev

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

@@ -173,7 +173,7 @@ public class InquiryUtils {
     public static PublicInquiryItem findBySourceId(Long id, Long enuu) throws Exception {
         JSONObject formData = new JSONObject();
         formData.put("id", id);
-        formData.put("enuu", enuu);
+        formData.put("en_uu", enuu);
         HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/sale/quote", formData);
         if (res.getStatusCode() == 200) {
             if (null != res.getResponseText()) {
@@ -196,7 +196,7 @@ public class InquiryUtils {
     public static PublicInquiryItem findInquiryById(Long id, Long enuu) throws Exception {
         JSONObject formData = new JSONObject();
         formData.put("id", id);
-        formData.put("enuu", enuu);
+        formData.put("en_uu", enuu);
         HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/sale/inquiry/detail", formData);
         if (res.getStatusCode() == 200) {
             if (null != res.getResponseText()) {

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

@@ -5567,7 +5567,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         if ($scope.inquiryItem.replies == null) {
             $scope.inquiryItem.replies = [];
             var reply = {
-                lapQty: null,
+                lapQty: 0,
                 price: null
             };
             $scope.inquiryItem.replies.push(reply);

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

@@ -399,7 +399,7 @@
                                         <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)" ng-if="isOverDue(inquiryItem.inquiry.endDate)">我要报价</a>
-                                            <a class="offer" ng-if="!isOverDue(inquiryItem.inquiry.endDate)" ng-click="">已过期</a>
+                                            <a class="offer" ng-if="!isOverDue(inquiryItem.inquiry.endDate)" ng-click="">已结束</a>
                                         </td>
                                     </tr>
                                </tbody>

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

@@ -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" ng-pattern="/^[1-9]*$/">
+                    <input type="text" class="form-control" id="inputEmail2" placeholder="20" ng-model="inquiryItem.leadtime" ng-pattern="/^[1-9]*$/" ng-required="true">
                 </div>
             </div>
         </div>
@@ -162,7 +162,7 @@
             <div class="form-group">
                 <label class="col-xs-4 control-label">币种（选择）</label>
                 <div class="col-xs-8">
-                    <select name="" id="" class="form-control" inquiryItem="inquiryItem.currency">
+                    <select name="" id="" class="form-control" inquiryItem="inquiryItem.currency" ng-required="true">
                         <option value="RMB">RMB</option>
                         <option value="YEN">YEN</option>
                     </select>
@@ -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" ng-pattern="/^[1-9]*$/" ng-required="true">
+                    <input type="text" class="form-control" id="inputEmail6" ng-model="reply.lapQty" ng-pattern="/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/" ng-required="true">
                 </div>
             </div>
         </div>