Merge remote-tracking branch 'origin/feature_bill_v2' into feature_bill_v2_new

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_invoice_ctrl.js

@@ -158,6 +158,9 @@ define(['app/app'], function(app) {
         $scope.showDeleteBox = false
         $scope.setChangeBillStatusFlag = function (flag) {
             $scope.changeBillStatusFlag = flag;
+            if (!flag) {
+                $scope.bill = {};
+            }
         }
         $scope.addBill = function () {
             $scope.setType();

src/main/webapp/resources/view/usercenter/forstore/buyer_invoice.html

@@ -409,44 +409,44 @@
                     <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" name="billHead" ng-maxlength="50" required="required" placeholder="请输入发票抬头">
+                            <input type="text" class="form-control" ng-model="bill.head" 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">请勿超过50个字</div>
+                        <div class="text-inverse error col-md-3" ng-show="(bill.head||form.billHead.$touched)&&form.billHead.$invalid" ng-bind="(!bill.head || bill.head == '')?'请填写发票抬头':'请勿超过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" name="companyAddr" ng-maxlength="50" required="required" placeholder="请输入单位地址">
+                            <input type="text" class="form-control" ng-model="bill.companyAddress" 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">请勿超过50个字</div>
+                        <div class="text-inverse error col-md-3" ng-show="(bill.companyAddress||form.companyAddr.$touched)&&form.companyAddr.$invalid" ng-bind="(!bill.companyAddress || bill.companyAddress == '')?'请填写单位地址':'请勿超过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" placeholder="区号和号码使用 '-' 隔开,或者不填区号" name="companyPhone" ng-model="bill.companyPhone" ng-maxlength="20" ng-pattern="/^[0-9][0-9\-]*[0-9]$/" required="required">
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.companyPhone||form.companyPhone.$touched)&&form.companyPhone.$invalid">请勿超过20个字符</div>
+                        <div class="text-inverse error col-md-3" ng-show="(bill.companyPhone||form.companyPhone.$touched)&&form.companyPhone.$invalid" ng-bind="(!bill.companyPhone || bill.companyPhone == '')?'请填写单位电话':'请勿超过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" name="companyTaxNum" required="true" placeholder="请输入税务登记号">
                         </div>
-                        <div class="text-inverse error col-md-3" ng-show="(bill.companyTaxNumber||form.companyTaxNum.$touched)&&(form.companyTaxNum.$error.required||form.companyTaxNum.$error.minlength)">请输入15-20个字符</div>
+                        <div class="text-inverse error col-md-3" ng-show="(bill.companyTaxNumber||form.companyTaxNum.$touched)&&(form.companyTaxNum.$error.required||form.companyTaxNum.$error.minlength)" ng-bind="(!bill.companyTaxNumber || bill.companyTaxNumber == '')?'请填写税务登记号':'请输入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" name="bankName" required="required" ng-maxlength="30" placeholder="请输入开户银行">
+                            <input type="text" class="form-control" ng-model="bill.bankName" 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">请勿超过30个字</div>
+                        <div class="text-inverse error col-md-3" ng-show="(bill.bankName||form.bankName.$touched)&&form.bankName.$invalid" ng-bind="(!bill.bankName || bill.bankName == '')?'请填写开户银行':'请勿超过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-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)">请勿超过30个字</div>
+                        <div class="text-inverse error col-md-3" ng-show="(bill.bankAccount||form.account.$touched)&&(form.account.$invalid)" ng-bind="(!bill.bankAccount || bill.bankAccount == '')?'请填写开户银行账号':'请勿超过30个字符'"></div>
                     </div>
                     <div class="form-group"  ng-if="billType == 1205">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>上传开户许可证：</label>
@@ -458,20 +458,17 @@
                     <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-model="bill.name" name="billName" required="required" ng-maxlength="10" placeholder="请输入收票人">
-                        </div>
-                        <div class="text-inverse error col-md-3">
-                            <span ng-show="form.billName.$dirty && linkError">请勿超过10个字</span>
-                            <span ng-show="(bill.name||form.billName.$touched)&&form.billName.$invalid">必填项</span>
+                            <input id="mzbillname" type="text" class="form-control" 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="(!bill.name || bill.name == '')?'请填写收票人姓名':'请勿超过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" name="billTel"
-                                   ng-pattern="/^((\(\d{3}\))|(\d{3}\\-))?(13|15|17|18)\d{9}$/" ng-length="11" required="required" placeholder="请输入联系电话">
+                                   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">输入8-11位数字</div>
+                        <div class="text-inverse error col-md-3" ng-show="(bill.telephone || form.billTel.$touched)&&form.billTel.$invalid" ng-bind="(!bill.telephone || bill.telephone == '')?'请填写联系电话':'输入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>
@@ -502,20 +499,13 @@
                     <div class="form-group">
                         <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="30"
+                            <input id="mzaddress" type="text" class="form-control" required="required" name="billDetail" ng-model="bill.detailAddress" ng-maxlength="60"
                             placeholder="建议您填写详细发件地址，如街道名，门牌号，楼层和房间号等信息">
                         </div>
                         <div class="text-inverse error col-md-3">
-                            <span ng-show="form.billName.$dirty && addressError">请勿超过30个字</span>
-                            <span ng-show="(bill.detailAddress||form.billDetail.$touched)&&form.billDetail.$invalid">必填项</span>
+                            <div class="text-inverse error col-md-3" ng-show="(bill.detailAddress || form.billDetail.$touched)&&form.billDetail.$invalid" ng-bind="(!bill.detailAddress || bill.detailAddress == '')?'请填写详细地址':'请勿超过30个字'"></div>
                         </div>
                     </div>
-                    <!--<div class="form-group" ng-show="bill.generalTaxpayerCertUrl">
-                        <label for="generalTaxpayerCert" class="col-md-3 control-label">一般纳税人认定证书:</label>
-                        <div class="col-md-5">
-                            <input type="file" id="generalTaxpayerCert" name="generalTaxpayerCert" class="form-control" ng-file-select ng-model="generalTaxpayerCertFile" ng-multiple="false" accept="image/*,application/pdf,*.pdf">
-                        </div>
-                    </div>-->
                     <div class="form-bottom">
                         <div class="form-group">
                                 <label class="check-active checkbox-inline text-inverse">
@@ -523,7 +513,7 @@
                                     <label for="check-mzy"></label>
                                     <span style="color: #333;">我已阅读并同意</span>
                                 </label>
-                                <a href="help#/nav/19" style="color: #5078cb;">《发票须知》</a>
+                                <a href="help#/nav/19" target="_blank" style="color: #5078cb;">《发票须知》</a>
                         </div>
                         <div class="form-btn">
                             <input type="button" value="取消" class="btn" ng-click="setChangeBillStatusFlag(false)">