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

表单验证改为失去焦点时触发,样式细节调整

yangc 8 лет назад
Родитель
Сommit
6aac641f2c

+ 20 - 20
src/main/webapp/resources/view/usercenter/forstore/buyer_invoice.html

@@ -387,7 +387,7 @@
                     </dd>
                     <dd ng-if="invoices.length == 0 || !invoices" class="text-center invoice-box" style="font-size: 12px;line-height: 200px;height: 200px">
                         <img src="static/img/all/empty-cart.png">
-                        <span style="width: auto;float: right;line-height: 200px;color: #999;position: relative;right: 400px;font-size: 12px">暂无未开票订单</span>
+                        <span style="width: auto;float: right;line-height: 200px;color: #999;position: relative;right: 400px;font-size: 12px">暂无开票信息</span>
                     </dd>
                 </dl>
             </div>
@@ -415,66 +415,66 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>发票抬头:</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" ng-model="bill.head" ng-focus="form.billHead.$touched = true" name="billHead" ng-maxlength="100" required="required" placeholder="请输入发票抬头">
+                            <input type="text" class="form-control" ng-model="bill.head" ng-focus="form.billHead.$touched = false" ng-blur="form.billHead.$touched = true" name="billHead" ng-maxlength="100" required="required" placeholder="请输入发票抬头">
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.head||form.billHead.$touched)&&form.billHead.$invalid" ng-bind="form.billHead.$error.required?'请填写发票抬头':'请勿超过50个字'"></div>
+                        <div class="text-inverse error col-md-3" ng-show="form.billHead.$touched&&form.billHead.$invalid" ng-bind="form.billHead.$error.required?'请填写发票抬头':'请勿超过50个字'"></div>
                     </div>
                     <div class="form-group" ng-if="billType == 1205">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>单位地址:</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" ng-model="bill.companyAddress" ng-focus="form.companyAddr.$touched = true" name="companyAddr" ng-maxlength="100" required="required" placeholder="请输入单位地址">
+                            <input type="text" class="form-control" ng-model="bill.companyAddress" ng-focus="form.companyAddr.$touched = false" ng-blur="form.companyAddr.$touched = true" name="companyAddr" ng-maxlength="100" required="required" placeholder="请输入单位地址">
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.companyAddress||form.companyAddr.$touched)&&form.companyAddr.$invalid" ng-bind="form.companyAddr.$error.required?'请填写单位地址':'请勿超过50个字'"></div>
+                        <div class="text-inverse error col-md-3" ng-show="form.companyAddr.$touched&&form.companyAddr.$invalid" ng-bind="form.companyAddr.$error.required?'请填写单位地址':'请勿超过50个字'"></div>
                     </div>
                     <div class="form-group"  ng-if="billType == 1205">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>单位电话:</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" ng-focus="form.companyPhone.$touched = true" placeholder="区号和号码使用 '-' 隔开,或者不填区号" name="companyPhone" ng-model="bill.companyPhone" ng-maxlength="20" required="required">
+                            <input type="text" class="form-control" ng-focus="form.companyPhone.$touched = false" ng-blur="form.companyPhone.$touched = true" placeholder="区号和号码使用 '-' 隔开,或者不填区号" name="companyPhone" ng-model="bill.companyPhone" ng-maxlength="20" required="required">
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.companyPhone||form.companyPhone.$touched)&&form.companyPhone.$invalid" ng-bind="form.companyPhone.$error.required?'请填写单位电话':'请勿超过20个字符'"></div>
+                        <div class="text-inverse error col-md-3" ng-show="form.companyPhone.$touched&&form.companyPhone.$invalid" ng-bind="form.companyPhone.$error.required?'请填写单位电话':'请勿超过20个字符'"></div>
                     </div>
                     <div class="form-group"  ng-if="billType == 1205">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>税务登记号:</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" ng-model="bill.companyTaxNumber" ng-focus="form.companyTaxNum.$touched = true" name="companyTaxNum" required="true" ng-maxlength="20" ng-minlength="15" ng-pattern="/^[0-9a-zA_Z]+$/" placeholder="请输入税务登记号">
+                            <input type="text" class="form-control" ng-model="bill.companyTaxNumber" ng-focus="form.companyTaxNum.$touched = false" ng-blur="form.companyTaxNum.$touched = true" name="companyTaxNum" required="true" ng-maxlength="20" ng-minlength="15" ng-pattern="/^[0-9a-zA_Z]+$/" placeholder="请输入税务登记号">
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.companyTaxNumber||form.companyTaxNum.$touched)&&(form.companyTaxNum.$invalid)" ng-bind="form.companyTaxNum.$error.required?'请填写税务登记号':'请输入15-20位税务登记号'"></div>
+                        <div class="text-inverse error col-md-3" ng-show="form.companyTaxNum.$touched&&(form.companyTaxNum.$invalid)" ng-bind="form.companyTaxNum.$error.required?'请填写税务登记号':'请填写15-20位数字或字母'"></div>
                     </div>
                     <div class="form-group"  ng-if="billType == 1205">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>开户银行:</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" ng-model="bill.bankName" ng-focus="form.bankName.$touched = true" name="bankName" required="required" ng-maxlength="60" placeholder="请输入开户银行">
+                            <input type="text" class="form-control" ng-model="bill.bankName" ng-focus="form.bankName.$touched = false" ng-blur="form.bankName.$touched = true" name="bankName" required="required" ng-maxlength="60" placeholder="请输入开户银行">
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.bankName||form.bankName.$touched)&&form.bankName.$invalid" ng-bind="form.bankName.$error.required?'请填写开户银行':'请勿超过30个字'"></div>
+                        <div class="text-inverse error col-md-3" ng-show="form.bankName.$touched&&form.bankName.$invalid" ng-bind="form.bankName.$error.required?'请填写开户银行':'请勿超过30个字'"></div>
                     </div>
                     <div class="form-group"  ng-if="billType == 1205">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>开户银行账户:</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" ng-model="bill.bankAccount" name="account" ng-focus="form.account.$touched = true" ng-pattern="/^[0-9]*$/" required ng-maxlength="30" placeholder="请输入开户银行账号">
+                            <input type="text" class="form-control" ng-model="bill.bankAccount" name="account" ng-focus="form.account.$touched = false" ng-blur="form.account.$touched = true" ng-pattern="/^[0-9]*$/" required ng-maxlength="30" placeholder="请输入开户银行账号">
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.bankAccount||form.account.$touched)&&(form.account.$invalid)" ng-bind="form.account.$error.required?'请填写开户银行账号':'请勿超过30个字符'"></div>
+                        <div class="text-inverse error col-md-3" ng-show="form.account.$touched&&(form.account.$invalid)" ng-bind="form.account.$error.required?'请填写开户银行账号':'请填写30位以内的数字'"></div>
                     </div>
                     <div class="form-group"  ng-if="billType == 1205">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>上传开户许可证:</label>
                         <div class="col-md-6">
                             <input type="file" ng-file-select class="form-control" ng-model="bill.permission" name="permission" ng-change="onPermissionUpload()" ng-multiple="false" accept="image/gif,image/jpeg,image/jpg,image/png,image/svg,application/pdf,*.pdf" required>
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.permission||form.permission.$touched)&&(form.permission.$invalid)">请勿超过3M</div>
+                        <div class="text-inverse error col-md-3" ng-show="(bill.permission||form.permission.$touched)&&(form.permission.$invalid)">请上传开户许可证</div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>收票人:</label>
                         <div class="col-md-6">
-                            <input id="mzbillname" type="text" class="form-control" ng-focus="form.billName.$touched = true" ng-model="bill.name" name="billName" required="required" ng-maxlength="20" placeholder="请输入收票人">
+                            <input id="mzbillname" type="text" class="form-control" ng-focus="form.billName.$touched = false" ng-blur="form.billName.$touched = true" ng-model="bill.name" name="billName" required="required" ng-maxlength="20" placeholder="请输入收票人">
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.name||form.billName.$touched)&&(form.billName.$invalid)" ng-bind="form.billName.$error.required?'请填写收票人姓名':'请勿超过10个字'"></div>
+                        <div class="text-inverse error col-md-3" ng-show="form.billName.$touched&&(form.billName.$invalid)" ng-bind="form.billName.$error.required?'请填写收票人姓名':'请勿超过10个字'"></div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>联系电话:</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" ng-model="bill.telephone" ng-focus="form.billTel.$touched = true" name="billTel"
+                            <input type="text" class="form-control" ng-model="bill.telephone" ng-focus="form.billTel.$touched = false" ng-blur="form.billTel.$touched = true" name="billTel"
                                    ng-pattern="/^[0-9]*$/" ng-maxlength="11" ng-minlength="8" required="required" placeholder="请输入联系电话">
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.telephone || 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-11位数字'"></div>
                     </div>
                     <div class="form-group address">
                         <label class="col-md-2 control-label" style="position: relative;top: 20px;"><b class="text-inverse">*</b>所在地区:</label>
@@ -506,9 +506,9 @@
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>详细地址:</label>
                         <div class="col-md-6">
                             <input id="mzaddress" type="text" class="form-control" required="required" name="billDetail" ng-model="bill.detailAddress" ng-maxlength="60"
-                            placeholder="建议您填写详细发件地址,如街道名,门牌号,楼层和房间号等信息" ng-focus="form.billDetail.$touched = true" >
+                            placeholder="建议您填写详细发件地址,如街道名,门牌号,楼层和房间号等信息" ng-focus="form.billDetail.$touched = false" ng-blur="form.billDetail.$touched = true" >
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.detailAddress || form.billDetail.$touched)&&form.billDetail.$invalid" ng-bind="form.billDetail.$error.required?'请填写详细地址':'请勿超过30个字'"></div>
+                        <div class="text-inverse error col-md-3" ng-show="form.billDetail.$touched&&form.billDetail.$invalid" ng-bind="form.billDetail.$error.required?'请填写详细地址':'请勿超过30个字'"></div>
                     </div>
                     <div class="form-bottom">
                         <div class="form-group">

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

@@ -273,7 +273,7 @@
                         全选</th>
                     <th width="70">申请时间</th>
                     <th width="90">订单号</th>
-                    <th width="90">开票金额(¥)</th>
+                    <th width="90">开票金额(¥)</th>
                     <th width="55" class="select-line">
                         <select class="select-adder form-control" ng-change="billTypeSearch(billType)" ng-model="billType">
                             <option value="1">类型</option>
@@ -315,7 +315,7 @@
                 </tbody>
                 <tbody class="no-record-list" ng-if="!billData || billData.length<=0">
                 <tr class="height200">
-                <td colspan="10"><img src="static/img/all/empty-cart.png"><span>暂无开票申请</span></td>
+                <td colspan="10" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span>暂无开票申请</span></td>
                 </tr>
                 </tbody>
             </table>
@@ -326,12 +326,6 @@
     </div>
     <!--开票记录-->
     <div class="vendor-invoice" ng-if="active == 'apply_record'">
-        <div class="vendor-invoice-tip">
-            <p>温馨提示:</p>
-            <P>1、买家只能对订单状态为<strong>“交易成功”</strong>,且已不能再发起售后的人民币交易订单进行补开发票。</P>
-            <p>2、发票金额为产品总金额且不含运费、积分、优惠券、促销折扣等金额。</p>
-            <p>3、发票邮寄费用将由卖家承担。</p>
-        </div>
         <div class="invoice-search">
             <div class="fr">
                 <input type="text" class="form-control" ng-model="keyword" placeholder="商家名称/订单号/发票抬头/收票人/联系电话"/>
@@ -344,7 +338,7 @@
                 <tr>
                     <th width="70">申请时间</th>
                     <th width="90">订单号</th>
-                    <th width="90">开票金额(¥)</th>
+                    <th width="90">开票金额(¥)</th>
                     <th width="55" class="select-line">
                         <select class="select-adder form-control" ng-change="billTypeSearch(billType)" ng-model="billType">
                             <option value="1">类型</option>
@@ -380,7 +374,7 @@
                 </tbody>
                 <tbody class="no-record-list" ng-if="!billData || billData.length<=0">
                 <tr class="height200">
-                <td colspan="10"><img src="static/img/all/empty-cart.png"><span>暂无开票记录</span></td>
+                <td style="border: #fff 1px solid" colspan="10"><img src="static/img/all/empty-cart.png"><span>暂无开票记录</span></td>
                 </tr>
                 </tbody>
             </table>