第三次验收修改。

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

@@ -48,17 +48,18 @@ define(['app/app'], function(app) {
         $scope.bill = {};
         $scope.bill.address = {};
 
-        //许可证上传
-        $scope.onFileUpload = function () {
-            console.log(event.target.files[0]);
-        }
             //保存发票信息
-            $scope.saveBill = function() {
-                $scope.bill.kind = $scope.billType
-                if (!$scope.isAdd) { //修改
-                    doSave('修改发票信息');
-                } else { // 新增
-                    doSave('添加发票');
+            $scope.saveBill = function(flag) {
+                console.log(flag);
+                if (!flag) {
+                    $scope.bill.kind = $scope.billType
+                    if (!$scope.isAdd) { //修改
+                        doSave('修改发票信息');
+                    } else { // 新增
+                        doSave('添加发票');
+                    }
+                } else {
+                    toaster.pop('error', '请填写正确的发票信息');
                 }
             };
             var doSave = function (message) {
@@ -195,6 +196,9 @@ define(['app/app'], function(app) {
                 $scope.bill = {};
             }
         }
+        $scope.exitEdit = function () {
+            $state.reload();
+        }
         $scope.addBill = function () {
             $scope.setType();
             $scope.bill = {};

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

@@ -376,24 +376,24 @@
     #bill-info .form-area .input-file-default {
         width: 75px;
     }
-    .ticket_record_list dl dd:last-child {
+    .ticket_record_list dl dd:hover {
         background: #f1f5ff;
     }
     #bill-info .select-file-box input {
         display: none;
     }
     #bill-info .select-file-box span {
-        width: 76px;
+        width: 74px;
         display: block;
         text-align: center;
-        height: 24px;
-        line-height: 24px;
+        height: 22px;
+        line-height: 22px;
         background: #ff8522;
         font-size: 12px;
         color: #fff;
         margin-top: 5px;
         position: relative;
-        left: -20px;
+        left: -22px;
         border-radius: 2px;
     }
     .cursor-not-allowed {
@@ -404,6 +404,26 @@
         border-bottom: #dae5fd 1px solid!important;
         border-right: #dae5fd 1px solid;
     }
+    #bill-info .form-input-line {
+        height: 34px;
+        width: 331px;
+        display: inline-block;
+        margin: 0 15px;
+        float: left;
+    }
+    #bill-info .form-input-line input[type='text'],#bill-info .form-input-line select {
+        border-radius: 2px;
+        border: 1px solid #eef4ff;
+    }
+    #bill-info .file-line {
+        width: 247px;
+    }
+    #bill-info .address .form-input-line {
+        margin: 0 10px 0 0;
+    }
+    #bill-info .address .form-input-line:first-child {
+        margin-left: 15px;
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr u_c_invoice">
@@ -421,7 +441,7 @@
         <div class="match-menu" ng-if="changeBillStatusFlag">
                 <span class="active">
                     <a ng-bind="isAdd?'新增发票信息':'修改发票信息'"></a>
-                    <i class="fa fa-remove" ng-click="setChangeBillStatusFlag(false)"></i>
+                        <i class="fa fa-remove" ng-click="exitEdit()"></i>
                 </span>
         </div>
         <!--我的发票-->
@@ -496,49 +516,49 @@
                 <form class="form-horizontal" novalidate="novalidate" name="form">
                     <div class="form-group">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>发票抬头：</label>
-                        <div class="col-md-5">
+                        <div class="form-input-line">
                             <input type="text" class="form-control" ng-model="bill.head" ng-focus="form.billHead.$touched = false" ng-blur="form.billHead.$touched = true; checkBillHead()" name="billHead" required="required" placeholder="请输入发票抬头">
                         </div>
                         <div class="text-inverse error col-md-3" ng-show="form.billHead.$touched&&(form.billHead.$invalid || !validForm.validBillHead)" 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-5">
+                        <div class="form-input-line">
                             <input type="text" class="form-control" ng-model="bill.companyAddress" ng-focus="form.companyAddr.$touched = false" ng-blur="form.companyAddr.$touched = true; checkCompanyAddress()" name="companyAddr" required="required" placeholder="请输入单位地址">
                         </div>
                         <div class="text-inverse error col-md-3" ng-show="form.companyAddr.$touched&&(form.companyAddr.$invalid || !validForm.validCompanyAddress)" 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-5">
+                        <div class="form-input-line">
                             <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-pattern="/^0\d{2,3}-[1-9]\d{6,7}$/" ng-maxlength="20" required="required">
                         </div>
                         <div class="text-inverse error col-md-3" ng-show="form.companyPhone.$touched&&form.companyPhone.$invalid" ng-bind="form.companyPhone.$error.required?'请填写单位电话':form.companyPhone.$error.maxlength?'请勿超过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-5">
+                        <div class="form-input-line">
                             <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="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-5">
+                        <div class="form-input-line">
                             <input type="text" class="form-control" ng-model="bill.bankName" ng-focus="form.bankName.$touched = false" ng-blur="form.bankName.$touched = true; checkBankName()" name="bankName" required="required" placeholder="请输入开户银行">
                         </div>
                         <div class="text-inverse error col-md-3" ng-show="form.bankName.$touched&&(form.bankName.$invalid || !validForm.validBankName)" 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-5">
+                        <div class="form-input-line">
                             <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="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-4">
+                        <div class="form-input-line file-line">
                             <input type="text" name="permission" required class="form-control" ng-model="bill.attachUrl" readonly style="background: #fff">
                         </div>
                         <div class="col-md-1">
@@ -550,14 +570,14 @@
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>收票人：</label>
-                        <div class="col-md-5">
+                        <div class="form-input-line">
                             <input id="mzbillname" type="text" class="form-control" ng-focus="form.billName.$touched = false" ng-blur="form.billName.$touched = true; checkBillName()" ng-model="bill.name" name="billName" required="required" placeholder="请输入收票人">
                         </div>
                         <div class="text-inverse error col-md-3" ng-show="form.billName.$touched&&(form.billName.$invalid || !validForm.validBillName)" 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-5">
+                        <div class="form-input-line">
                             <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>
@@ -566,7 +586,7 @@
                     <div class="form-group address">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>所在地区：</label>
                         <div class="row checkbox">
-                            <div class="col-md-3">
+                            <div class="form-input-line" style="width: 160px">
                                 <select required="required" class="select-adder form-control"
                                         ng-model="bill.address.province" name="province"
                                         ng-options="key as key for (key,value) in division"
@@ -574,14 +594,14 @@
                                     <option value="">省</option>
                                 </select>
                             </div>
-                            <div class="col-md-3">
+                            <div class="form-input-line" style="width: 160px">
                                 <select class="select-adder form-control" ng-model="bill.address.city" name="city"
                                         ng-options="key as key for (key,value) in division[bill.address.province]"
                                         ng-change="bill.address.district='';" required="required">
                                     <option value="">市</option>
                                 </select>
                             </div>
-                            <div class="col-md-3">
+                            <div class="form-input-line" style="width: 160px">
                                 <select class="select-adder form-control" ng-model="bill.address.district" name="district"
                                         ng-options="value as value for value in division[bill.address.province][bill.address.city]" required="required">
                                     <option value="">区</option>
@@ -591,7 +611,7 @@
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>详细地址：</label>
-                        <div class="col-md-5">
+                        <div class="form-input-line" style="width: 502px">
                             <input id="mzaddress" type="text" class="form-control" required="required" name="billDetail" ng-model="bill.detailAddress" title="建议您填写详细发件地址，如街道名，门牌号，楼层和房间号等信息"
                             placeholder="建议您填写详细发件地址，如街道名，门牌号，楼层和房间号等信息" ng-focus="form.billDetail.$touched = false" ng-blur="form.billDetail.$touched = true; checkDetailAddress()" >
                         </div>
@@ -608,7 +628,8 @@
                         </div>
                         <div class="form-btn">
                             <input type="button" value="取消" class="btn" ng-click="setChangeBillStatusFlag(false)">
-                            <input type="submit" value="保存" class="btn" ng-disabled="form.$invalid||(!bill.is_agree)||(!checkValidFrom())" ng-click="saveBill()">
+                            <input type="submit" value="保存" class="btn"
+                                   ng-click="saveBill(form.$invalid||(!bill.is_agree)||(!checkValidFrom()))">
                         </div>
                     </div>
                 </form>

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

@@ -149,7 +149,7 @@
                             <th width="88">申请时间</th>
                             <th width="130">商家名称</th>
                             <th width="80">订单号</th>
-                            <th width="100">可开票金额(￥)</th>
+                            <th width="105">可开票金额(￥)</th>
                             <th width="55" class="select-line">
                                 <select class="select-adder form-control" ng-model="invoiceType" ng-change="changeInvoiceType(invoiceType)">
                                     <option value="">类型</option>

src/main/webapp/resources/view/usercenter/modal/apply-invoice.html

@@ -3,6 +3,7 @@
     width: 590px;
     border-radius: 5px;
     overflow: hidden;
+    margin-top: 10%;
 }
 .modal-content{
     border: none;

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

@@ -135,6 +135,10 @@
     }
     .invoice-com-tab tbody>tr td.address p{
         font-size: 14px;
+        width: 161px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
     /*操作确认框*/
     .com-del-box{