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

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

@@ -138,7 +138,7 @@
             <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" ng-pattern="/[1-9]\d*/">
+                    <input type="text" class="form-control" id="inputEmail3" placeholder="1000" ng-model="inquiryItem.minOrderQty" ng-pattern="/^[0-9]*[1-9][0-9]*$/">
                 </div>
             </div>
         </div>
@@ -146,21 +146,21 @@
             <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" ng-pattern="/[1-9]\d*/">
+                    <input type="text" class="form-control" id="inputEmail1" placeholder="1000" ng-model="inquiryItem.minPackQty" ng-pattern="/^[0-9]*[1-9][0-9]*$/">
                 </div>
             </div>
         </div>
         <div class="col-xs-6 form-horizontal">
             <div class="form-group">
-                <label for="inputEmail2" class="col-xs-4 control-label">交货周期（天）</label>
+                <label for="inputEmail2" class="col-xs-4 control-label text-inverse">交货周期（天）</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail2" placeholder="20" ng-model="inquiryItem.leadtime" ng-pattern="/^[1-9]*$/" ng-required="true">
+                    <input type="text" class="form-control" id="inputEmail2" placeholder="20" ng-model="inquiryItem.leadtime" ng-pattern="/^[0-9]*[1-9][0-9]*$/" ng-required="true">
                 </div>
             </div>
         </div>
         <div class="col-xs-6 form-horizontal">
             <div class="form-group">
-                <label class="col-xs-4 control-label">币种（选择）</label>
+                <label class="col-xs-4 control-label text-inverse">币种（选择）</label>
                 <div class="col-xs-8">
                     <select name="" id="" class="form-control" ng-model="inquiryItem.currency" ng-required="true">
                         <option value="RMB">RMB</option>
@@ -192,13 +192,13 @@
                 <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="/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/" 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" ng-disabled="$first">
                 </div>
             </div>
         </div>
         <div class="col-xs-6 form-horizontal">
             <div class="form-group">
-                <label for="inputEmail7" class="col-xs-4 control-label">价格
+                <label for="inputEmail7" class="col-xs-4 control-label text-inverse">价格
                     <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" 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">