Просмотр исходного кода

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

yangc 7 лет назад
Родитель
Сommit
035326df9b

+ 2 - 2
src/main/webapp/resources/view/sso/ssoInvoice.html

@@ -667,9 +667,9 @@
             <label class="col-md-2 control-label"><b class="text-inverse">*</b>联系电话:</label>
             <div class="form-input-line">
               <input type="text" class="form-control" ng-class="{'bg-fff8ee':!initFlag.initTelephone&&form.billTel.$error.required, 'bg-fff':!initFlag.initTelephone&&(!form.billTel.$invalid||!form.billTel.$touched)}" ng-model="bill.telephone" ng-focus="form.billTel.$touched = false" ng-blur="form.billTel.$touched = true; initFlag.initTelephone=false;" name="billTel"
-                     ng-pattern="/^[0-9\\-]*$/" ng-minlength="8" maxlength="11" required="required" placeholder="请输入联系电话">
+                     ng-pattern="/^[0-9\\-]*$/" ng-minlength="8" maxlength="13" required="required" placeholder="请输入联系电话">
             </div>
-            <div class="text-inverse error col-md-3" ng-show="form.billTel.$touched&&form.billTel.$invalid" ng-bind="form.billTel.$error.required?'请填写联系电话':'请输入8-11位电话号码'"></div>
+            <div class="text-inverse error col-md-3" ng-show="form.billTel.$touched&&form.billTel.$invalid" ng-bind="form.billTel.$error.required?'请填写联系电话':'请输入8-13位电话号码'"></div>
           </div>
           <div class="form-group address">
             <label class="col-md-2 control-label"><b class="text-inverse">*</b>所在地区:</label>

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor-invoice.html

@@ -425,7 +425,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="item in billData track by $index" on-finish-render>
+                    <tr ng-repeat="item in billData track by $index" on-finish-render >
                         <td  style="width: 60px;">
                             <lable class="check-act">
                                 <input type="checkbox" id={{$index+1}} ng-checked="item.checked" ng-click="checkInvoice(item)" />