Browse Source

发票管理搜索框样式调整

yangc 8 years ago
parent
commit
e9f83f227c

+ 25 - 25
src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_invoice_ctrl.js

@@ -26,7 +26,7 @@ define(['app/app'], function(app) {
             });
             });
         };
         };
         getInvoiceInfo();
         getInvoiceInfo();
-
+        // $scope.bill = {};
         // 获取省市区地理信息
         // 获取省市区地理信息
         var getGeoInfo = function () {
         var getGeoInfo = function () {
             $http.get('static/js/prod/data/city.json').success(function(data) {
             $http.get('static/js/prod/data/city.json').success(function(data) {
@@ -47,30 +47,30 @@ define(['app/app'], function(app) {
 
 
         $scope.bill = {};
         $scope.bill = {};
         $scope.bill.address = {};
         $scope.bill.address = {};
-        $scope.bill.is_agree = true;
-        $scope.linkError = false;
-        $scope.addressError = false;
-        $scope.saveInvoice = function() {
-            $scope.bill.area = $scope.bill.address.province + "," + $scope.bill.address.city + "," + $scope.bill.address.district;
-            var file = null;
-            if($scope.bill.billInfo&&$scope.bill.billInfo[0]) {
-                file = $scope.bill.billInfo[0];
-            }
-            $upload.upload({
-                url: 'trade/bill/save',
-                file: file,
-                method: 'POST',
-                data: {
-                    bill: $scope.bill
-                }
-            }).success(function(data){
-                toaster.pop('success', '保存成功');
-                sessionStorage.setItem('invoiceType', $scope.bill.kind);
-                $state.reload();
-            }).error(function(data){
-                toaster.pop('error', data);
-            });
-        };
+        // $scope.bill.is_agree = true;
+        // $scope.linkError = false;
+        // $scope.addressError = false;
+        // $scope.saveInvoice = function() {
+        //     $scope.bill.area = $scope.bill.address.province + "," + $scope.bill.address.city + "," + $scope.bill.address.district;
+        //     var file = null;
+        //     if($scope.bill.billInfo&&$scope.bill.billInfo[0]) {
+        //         file = $scope.bill.billInfo[0];
+        //     }
+        //     $upload.upload({
+        //         url: 'trade/bill/save',
+        //         file: file,
+        //         method: 'POST',
+        //         data: {
+        //             bill: $scope.bill
+        //         }
+        //     }).success(function(data){
+        //         toaster.pop('success', '保存成功');
+        //         sessionStorage.setItem('invoiceType', $scope.bill.kind);
+        //         $state.reload();
+        //     }).error(function(data){
+        //         toaster.pop('error', data);
+        //     });
+        // };
 
 
             // $scope.linkmanLen = function() {
             // $scope.linkmanLen = function() {
             //     var size = $scope.bill.name.length;
             //     var size = $scope.bill.name.length;

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

@@ -423,9 +423,9 @@
                     <div class="form-group"  ng-if="billType == 1205">
                     <div class="form-group"  ng-if="billType == 1205">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>单位电话:</label>
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>单位电话:</label>
                         <div class="col-md-6">
                         <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">
+                            <input type="text" class="form-control" placeholder="区号和号码使用 '-' 隔开,或者不填区号" name="companyPhone" ng-model="bill.companyPhone" ng-maxlength="20" ng-pattern="/^[0-9]*$/" required="required">
                         </div>
                         </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 class="text-inverse error col-md-3" ng-show="(bill.companyPhone||form.companyPhone.$touched)&&form.companyPhone.$invalid" ng-bind="(!bill.companyPhone)?'请填写单位电话':'请勿超过20个字符'"></div>
                     </div>
                     </div>
                     <div class="form-group"  ng-if="billType == 1205">
                     <div class="form-group"  ng-if="billType == 1205">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>税务登记号:</label>
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>税务登记号:</label>
@@ -502,9 +502,7 @@
                             <input id="mzaddress" type="text" class="form-control" required="required" name="billDetail" ng-model="bill.detailAddress" ng-maxlength="60"
                             <input id="mzaddress" type="text" class="form-control" required="required" name="billDetail" ng-model="bill.detailAddress" ng-maxlength="60"
                             placeholder="建议您填写详细发件地址,如街道名,门牌号,楼层和房间号等信息">
                             placeholder="建议您填写详细发件地址,如街道名,门牌号,楼层和房间号等信息">
                         </div>
                         </div>
-                        <div class="text-inverse error col-md-3">
-                            <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 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-bottom">
                     <div class="form-bottom">
                         <div class="form-group">
                         <div class="form-group">

+ 1 - 1
src/main/webapp/resources/view/usercenter/forstore/buyer_invoice_record.html

@@ -97,7 +97,7 @@
     .invoice-search input.form-control{
     .invoice-search input.form-control{
         width: 330px;
         width: 330px;
         height: 32px;
         height: 32px;
-        line-height: 58px;
+        line-height: 32px;
         font-size: 12px;
         font-size: 12px;
         border-radius: 0;
         border-radius: 0;
         border: #5078cb 1px solid;
         border: #5078cb 1px solid;

+ 1 - 1
src/main/webapp/resources/view/usercenter/forstore/buyer_no_invoice.html

@@ -129,7 +129,7 @@
 .invoice-search input.form-control{
 .invoice-search input.form-control{
     width: 330px;
     width: 330px;
     height: 32px;
     height: 32px;
-    line-height: 58px;
+    line-height: 32px;
     font-size: 12px;
     font-size: 12px;
     border-radius: 0;
     border-radius: 0;
     border: #5078cb 1px solid;
     border: #5078cb 1px solid;

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

@@ -220,7 +220,7 @@
     .invoice-search input.form-control{
     .invoice-search input.form-control{
         width: 330px;
         width: 330px;
         height: 32px;
         height: 32px;
-        line-height: 58px;
+        line-height: 32px;
         font-size: 12px;
         font-size: 12px;
         border-radius: 0;
         border-radius: 0;
         border: #5078cb 1px solid;
         border: #5078cb 1px solid;