Merge remote-tracking branch 'origin/release-201844-wangcz' into release-201844-wangcz

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

@@ -170,9 +170,9 @@
         </div>
         <div class="col-xs-6 form-horizontal">
             <div class="form-group">
-                <label for="inputEmail4" class="col-xs-4 control-label">税率（%）</label>
+                <label for="inputEmail4" class="col-xs-4 control-label text-inverse">税率（%）</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail4" placeholder="税率（数字）" ng-model="inquiryItem.taxrate" ng-pattern="/^(\d|[123456789]\d)$/">
+                    <input type="text" class="form-control" id="inputEmail4" placeholder="税率（数字）" ng-model="inquiryItem.taxrate" ng-pattern="/^(\d|[123456789]\d)$/" ng-required="true">
                 </div>
             </div>
         </div>