Головна сторінка Огляд Довідка
Увійти
qmx
/
jy
14
0
Відгалуження 0
Файли Проблеми 2 Запити на злиття 0 Wiki
Переглянути джерело

feat:开发票控制

wangchuanjin 3 роки тому
батько
97938d5fa4
коміт
a26a6d6427
9 змінених файлів з 315 додано та 202 видалено
Розділений вигляд Показати статистику Diff
  1. 27 1
      src/jfw/modules/app/src/web/templates/invoice/cantInvoice.html
  2. 8 1
      src/jfw/modules/app/src/web/templates/invoice/invoicing.html
  3. 4 0
      src/jfw/modules/subscribepay/src/config/config.go
  4. 5 1
      src/jfw/modules/subscribepay/src/invoice.json
  5. 34 6
      src/jfw/modules/subscribepay/src/service/invoice.go
  6. 67 61
      src/web/templates/pc/invoice.html
  7. 11 8
      src/web/templates/pc/invoice_error.html
  8. 27 1
      src/web/templates/weixin/invoice/cantInvocie.html
  9. 132 123
      src/web/templates/weixin/invoice/invoicing.html

+ 27 - 1
src/jfw/modules/app/src/web/templates/invoice/cantInvoice.html
Переглянути файл 

@@ -20,6 +20,9 @@
 
 .p_text{
 
   color:#9B9CA3;
 
 }
 
+.check-rules{
 
+  visibility: hidden
 
+}
 
 </style>
 
 
 <body>
 
@@ -31,7 +34,7 @@
 
         </div>
 
         <div class="j-body" style="text-align:center;padding-top:1.5rem">
 
           <img src="/jyapp/images/wxkeyset/nopush.png?v=51430" style="width:2.25rem"/>
 
-          <p style="margin-top: 0.32rem;" class="p_text">
 
+          <p style="margin-top: 0.32rem;" class="p_text" id="reason">
 
             该订单发票在线申请已超时，请联系客服
 
           </p>
 
            <p class="p_text">
 
@@ -61,7 +64,29 @@
 
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/invoice/js/common.js?v={{Msg "seo" "version"}}"></script>
 
     <script>
 
         var order_code = {{.T.order_code}}
 
+        function getParam(name) {
 
+            var search = document.location.search;
 
+            var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
 
+            var matcher = pattern.exec(search);
 
+            var items = null;
 
+            if (null != matcher) {
 
+                try {
 
+                    items = decodeURIComponent(decodeURIComponent(matcher[1]));
 
+                } catch (e) {
 
+                    try {
 
+                        items = decodeURIComponent(matcher[1]);
 
+                    } catch (e) {
 
+                        items = matcher[1];
 
+                    }
 
+                }
 
+            }
 
+            return items;
 
+        }
 
         $(function () {
 
+          if(getParam("f")=="upgrade"){
 
+            $("#reason").text("因支付系统调整升级，该发票无法支持线上开票，如需开票，请联系客服。");
 
+          }else{
 
+            $(".check-rules").css("visibility","visible");
 
             $.ajax({
 
                 url:"/jypay/invoice/show",
 
                 type:"POST",
 
@@ -107,6 +132,7 @@
 
 
                 }
 
             })
 
+          }
 
         })
 
         var checkInvoice = {
 
             init:function(){

+ 8 - 1
src/jfw/modules/app/src/web/templates/invoice/invoicing.html
Переглянути файл 

@@ -17,7 +17,7 @@
 
 	<link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/invoice/css/invoicing.css?v={{Msg "seo" "version"}}">
 
 </head>
 
 
-<body>
 
+<body style="display:none;">
 
     <div class="j-container" id="invoicing">
 
         <div class="j-header jy-app-header" id="app-show">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
@@ -135,6 +135,11 @@
 
         var sys_err = ""
 
         var c = {{.T.c}}
 
             $(function () {
 
+              $.post("/jypay/invoice/available",{order_code:order_code},function(rr){
 
+              if(rr.status==1){
 
+                window.location.replace("/jyapp/front/cantInvoice?f=upgrade")
 
+              }else{
 
+                $("body").show();
 
                 $.ajax({
 
                     url:"/jypay/invoice/show",
 
                     type:"POST",
 
@@ -300,6 +305,8 @@
 
                         }
 
                     }
 
                 })
 
+                }
 
+              })
 
             })

+ 4 - 0
src/jfw/modules/subscribepay/src/config/config.go
Переглянути файл 

@@ -130,6 +130,10 @@ type Invoice struct {
 
 	Tax_policy                string
 
 	Invoice_interface_address string
 
 	Code                      string
 
+	Switch_paymch             struct {
 
+		Model int
 
+		Time  string
 
+	}
 
 }
 
 
 type entnicheConfig struct {

+ 5 - 1
src/jfw/modules/subscribepay/src/invoice.json
Переглянути файл 

@@ -4,5 +4,9 @@
 
   "tax_policy": "0",
 
   "invoice_nature": "0",
 
   "invoice_interface_address": "http://192.168.3.14:7081",
 
-  "code": "3040205000000000000"
 
+  "code": "3040205000000000000",
 
+  "switch_paymch":{
 
+	"model":1,
 
+	"time":"2022-01-17 10:00:00"
 
+  }
 
 }

+ 34 - 6
src/jfw/modules/subscribepay/src/service/invoice.go
Переглянути файл 

@@ -22,12 +22,13 @@ import (
 
 
 type Invoice struct {
 
 	*xweb.Action
 
-	addinvoice      xweb.Mapper `xweb:"/invoice/add"`      //开发票
 
-	showinvoice     xweb.Mapper `xweb:"/invoice/show"`     //查看发票
 
-	callbackinvoice xweb.Mapper `xweb:"/invoice/callback"` //开发票回调
 
-	replaceinvoice  xweb.Mapper `xweb:"/invoice/replace"`  //换发票
 
-	refundinvoice   xweb.Mapper `xweb:"/invoice/refund"`   //退票
 
-	invoiceinfo     xweb.Mapper `xweb:"/invoice/info"`     //订单详情数据
 
+	addinvoice      xweb.Mapper `xweb:"/invoice/add"`       //开发票
 
+	showinvoice     xweb.Mapper `xweb:"/invoice/show"`      //查看发票
 
+	callbackinvoice xweb.Mapper `xweb:"/invoice/callback"`  //开发票回调
 
+	replaceinvoice  xweb.Mapper `xweb:"/invoice/replace"`   //换发票
 
+	refundinvoice   xweb.Mapper `xweb:"/invoice/refund"`    //退票
 
+	invoiceinfo     xweb.Mapper `xweb:"/invoice/info"`      //订单详情数据
 
+	available       xweb.Mapper `xweb:"/invoice/available"` //是否可用开发票
 
 }
 
 
 var dbname = "invoice"
 
@@ -863,3 +864,30 @@ func InvoiceSendMail(target_mail, html string) {
 
 		time.Sleep(time.Second * 3)
 
 	}
 
 }
 
+
 
+func (this *Invoice) Available() {
 
+	u := util.Mysql.FindOne("dataexport_order", map[string]interface{}{"order_code": this.GetString("order_code")}, "pay_time", "")
 
+	status := 0
 
+	if u != nil {
 
+		if pay_time, _ := (*u)["pay_time"].(string); pay_time != "" && config.InvoiceConfig.Switch_paymch.Time != "" {
 
+			p1, err1 := time.ParseInLocation(qutil.Date_Full_Layout, pay_time, time.Local)
 
+			p2, err2 := time.ParseInLocation(qutil.Date_Full_Layout, config.InvoiceConfig.Switch_paymch.Time, time.Local)
 
+			if err1 == nil && err2 == nil {
 
+				if config.InvoiceConfig.Switch_paymch.Model == 1 { //大于该时间点，不能开票
 
+					if p1.Before(p2) {
 
+						status = 1
 
+					}
 
+				} else if config.InvoiceConfig.Switch_paymch.Model == 2 { //小于该时间点，不能开票
 
+					if p1.After(p2) {
 
+						status = 1
 
+					}
 
+				} else { //无限制，都能开票
 
+					status = 1
 
+				}
 
+			}
 
+		}
 
+	}
 
+	this.ServeJson(map[string]interface{}{
 
+		"status": status,
 
+	})
 
+}

+ 67 - 61
src/web/templates/pc/invoice.html
Переглянути файл 

@@ -44,7 +44,7 @@
 
 	    color: #999999;
 
 	}
 
 </style>
 
-<body>
 
+<body class="hidden">
 
     <!-- header -->
 
 	{{include "/common/pchead.html"}}
 
     <!-- main  START -->
 
@@ -156,66 +156,72 @@
 
     <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/invoice.js?v={{Msg "seo" "version"}}"></script>
 
 	<script>
 
 		  $(function(){
 
-			  var order_mail = {{.T.mail}};
 
-			  var order_phone = {{.T.phone}};
 
-			  if(order_mail!==""&&order_mail!==null&&order_mail!==undefined){
 
-				$(".email").val(order_mail)
 
-				$(".email").parent().siblings('.success').show();
 
-			  }
 
-			  if(order_phone!==""&&order_phone!==null&&order_phone!==undefined){
 
-			  	$(".tel").val(order_phone)
 
-				$(".tel").parent().siblings('.success').show();
 
-			  }
 
-			  var orderCode = {{.T.order_code}};
 
-			  var isSys = getParam("isSys");
 
-			  if(isSys === "true"){
 
-			  	  $.ajax({
 
-			  	  	type: 'POST',
 
-			  	  	url: '/jypay/invoice/show',
 
-			  	  	data: {"order_code":orderCode},
 
-					success: function(r){
 
-						if(r.status === "processing"){
 
-							if(r.data.invoice_type === "个人"){
 
-								$(".email").val(r.data.mail);
 
-								$(".tel").val(r.data.phone);
 
-								$(".email").parent().siblings('.success').show();
 
-								$(".tel").parent().siblings('.success').show();
 
-							}else{
 
-								$(".email").val(r.data.mail);
 
-								$(".tel").val(r.data.phone);
 
-								$(".unit_name").val(r.data.company_name);
 
-								$(".taxpayer_number").val(r.data.taxpayer_identnum);
 
-								$(".email").parent().siblings('.success').show();
 
-								$(".tel").parent().siblings('.success').show();
 
-								$(".unit_name").parent().siblings('.success').show();
 
-								$(".taxpayer_number").parent().siblings('.success').show();
 
-								$("#invoice_title > button").text("单位")
 
-								$(".unit_invoice").show();
 
-							}
 
-						}
 
-					}
 
-			  	  });
 
-			  }
 
-			  checkForm();
 
-
 
-			  var order_code = {{.T.order_code}};
 
-			  $(".order_code").text(order_code);
 
-			  $(".cancel_btn").on("click",function(){
 
-					window.history.go(-1);
 
-			  })
 
-
 
-			  $('#ruleModal').on('show.bs.modal', function () {
 
-			      var $this = $(this);
 
-			      var $modal_dialog = $this.find('.modal-dialog');
 
-			      $this.css('display', 'block');
 
-			      $modal_dialog.css({
 
-			          'margin-top': Math.max(0, ($(window).height() - $modal_dialog.height()) / 2)
 
-			      });
 
-			  });
 
-
 
-			  $("#public-nav").css("background","#fff");
 
-			  $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
 
-			  $("section[id='drder']").css("padding-top", "80px");
 
+        var orderCode = {{.T.order_code}};
 
+        $.post("/jypay/invoice/available",{order_code:orderCode},function(rr){
 
+          if(rr.status==0){
 
+            window.location.replace("/front/order/invoicetimeOut?f=upgrade")
 
+          }else{
 
+            $("body").removeClass("hidden");
 
+    			  var order_mail = {{.T.mail}};
 
+    			  var order_phone = {{.T.phone}};
 
+    			  if(order_mail!==""&&order_mail!==null&&order_mail!==undefined){
 
+    				$(".email").val(order_mail)
 
+    				$(".email").parent().siblings('.success').show();
 
+    			  }
 
+    			  if(order_phone!==""&&order_phone!==null&&order_phone!==undefined){
 
+    			  	$(".tel").val(order_phone)
 
+    				$(".tel").parent().siblings('.success').show();
 
+    			  }
 
+    			  var isSys = getParam("isSys");
 
+    			  if(isSys === "true"){
 
+  			  	  $.ajax({
 
+  			  	  	type: 'POST',
 
+  			  	  	url: '/jypay/invoice/show',
 
+  			  	  	data: {"order_code":orderCode},
 
+  					    success: function(r){
 
+      						if(r.status === "processing"){
 
+      							if(r.data.invoice_type === "个人"){
 
+      								$(".email").val(r.data.mail);
 
+      								$(".tel").val(r.data.phone);
 
+      								$(".email").parent().siblings('.success').show();
 
+      								$(".tel").parent().siblings('.success').show();
 
+      							}else{
 
+      								$(".email").val(r.data.mail);
 
+      								$(".tel").val(r.data.phone);
 
+      								$(".unit_name").val(r.data.company_name);
 
+      								$(".taxpayer_number").val(r.data.taxpayer_identnum);
 
+      								$(".email").parent().siblings('.success').show();
 
+      								$(".tel").parent().siblings('.success').show();
 
+      								$(".unit_name").parent().siblings('.success').show();
 
+      								$(".taxpayer_number").parent().siblings('.success').show();
 
+      								$("#invoice_title > button").text("单位")
 
+      								$(".unit_invoice").show();
 
+      							}
 
+      						}
 
+  					    }
 
+  			  	  });
 
+    			  }
 
+    			  checkForm();
 
+    			  var order_code = {{.T.order_code}};
 
+    			  $(".order_code").text(order_code);
 
+    			  $(".cancel_btn").on("click",function(){
 
+    					window.history.go(-1);
 
+    			  })
 
+    
+    			  $('#ruleModal').on('show.bs.modal', function () {
 
+    			      var $this = $(this);
 
+    			      var $modal_dialog = $this.find('.modal-dialog');
 
+    			      $this.css('display', 'block');
 
+    			      $modal_dialog.css({
 
+    			          'margin-top': Math.max(0, ($(window).height() - $modal_dialog.height()) / 2)
 
+    			      });
 
+    			  });
 
+    
+    			  $("#public-nav").css("background","#fff");
 
+    			  $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
 
+    			  $("section[id='drder']").css("padding-top", "80px");
 
+          }
 
+        });
 
 			  haslogin({{.T.logid}});
 
 		  })
 
 	</script>

+ 11 - 8
src/web/templates/pc/invoice_error.html
Переглянути файл 

@@ -37,8 +37,8 @@
 
         <div class="w e_main">
 
             <div>
 
                 <img class="jy404" src="/electronic_invoice/image/404.png" alt="">
 
-                <p>该订单发票在线申请已超时，请联系客服 <br>   客服电话：400-108-6670</p>
 
-                <div class="rules" data-toggle="modal" data-target="#ruleModal">开票规则</div>
 
+                <p><span id="reason">该订单发票在线申请已超时，请联系客服</span> <br>   客服电话：400-108-6670</p>
 
+                <div class="rules hidden" data-toggle="modal" data-target="#ruleModal">开票规则</div>
 
             </div>
 
         </div>
 
         <div class="modal fade" id="ruleModal" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myModalLabel" aria-hidden="true">
 
@@ -71,12 +71,15 @@
 
     <script src="/electronic_invoice/js/bootstrap.min.js"></script>
 
     <script>
 
         $(function () {
 
-			$("#public-nav").css("background","#fff");
 
-			$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
 
-			$("section[id='drder']").css("padding-top", "80px");
 
-			haslogin({{.T.logid}});
 
-
 
-
 
+            if(getParam("f")=="upgrade"){
 
+              $("#reason").text("因支付系统调整升级，该发票无法支持线上开票，如需开票，请联系客服。");
 
+            }else{
 
+              $(".rules").removeClass("hidden");
 
+            }
 
+      			$("#public-nav").css("background","#fff");
 
+      			$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
 
+      			$("section[id='drder']").css("padding-top", "80px");
 
+      			haslogin({{.T.logid}});
 
             $('#ruleModal').on('show.bs.modal', function () {
 
                 var $this = $(this);
 
                 var $modal_dialog = $this.find('.modal-dialog');

+ 27 - 1
src/web/templates/weixin/invoice/cantInvocie.html
Переглянути файл 

@@ -20,6 +20,9 @@
 
   .p_text{
 
     color:#9B9CA3;
 
   }
 
+  .j-header{
 
+    display: none;
 
+  }
 
 </style>
 
 
 <body>
 
@@ -31,7 +34,7 @@
 
         </div>
 
         <div class="j-body" style="text-align:center;padding-top:1.5rem">
 
           <img src="/images/search/nothing.png" style="width:2.25rem"/>
 
-          <p style="margin-top: 0.32rem;" class="p_text">
 
+          <p style="margin-top: 0.32rem;" class="p_text" id="reason">
 
           该订单发票在线申请已超时，请联系客服
 
           </p>
 
           <p class="p_text">
 
@@ -61,7 +64,29 @@
 
     <script src="{{Msg "seo" "cdn"}}/invoice/js/common.js"></script>
 
     <script>
 
         var order_code = {{.T.order_code}}
 
+        function getParam(name) {
 
+            var search = document.location.search;
 
+            var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
 
+            var matcher = pattern.exec(search);
 
+            var items = null;
 
+            if (null != matcher) {
 
+                try {
 
+                    items = decodeURIComponent(decodeURIComponent(matcher[1]));
 
+                } catch (e) {
 
+                    try {
 
+                        items = decodeURIComponent(matcher[1]);
 
+                    } catch (e) {
 
+                        items = matcher[1];
 
+                    }
 
+                }
 
+            }
 
+            return items;
 
+        }
 
         $(function () {
 
+          if(getParam("f")=="upgrade"){
 
+            $("#reason").text("因支付系统调整升级，该发票无法支持线上开票，如需开票，请联系客服。");
 
+          }else{
 
+            $(".j-header").css("display","flex");
 
             $.ajax({
 
                 url:"/jypay/invoice/show",
 
                 type:"POST",
 
@@ -107,6 +132,7 @@
 
 
                 }
 
             })
 
+          }
 
         })
 
         var checkInvoice = { 
             init:function(){

+ 132 - 123
src/web/templates/weixin/invoice/invoicing.html
Переглянути файл 

@@ -19,6 +19,9 @@
 
 	.j-i-alert .weui-toast{

 	  width: 7.6em;

 	}

+  body{

+    display: none;

+  }

 	</style>

 </head>

 

@@ -139,58 +142,100 @@
 
         var applybill_status = {{.T.applybill_status}}

         var sys_err = ""

         var c = {{.T.c}}

-            $(function () {

-                $.ajax({

-                    url:"/jypay/invoice/show",

-                    type:"POST",

-                    data:{"order_code":order_code},

-                    success:function (r) {

-                        if(r.status == "fail"){

-                            if (r.datas != ""){

-                                applybill_status = r.datas.applybill_status

-								product_name = r.datas.product_type

-								if (product_name == "历史数据"){  //历史数据

-                                    $(".user-phone").attr("value",r.datas.user_phone)

-                                    $(".user-mail").attr("value",r.datas.user_mail)

-									invoice.phoneStatus = true;

-									invoice.emailStatus = true;

-									$("#commit").removeAttr("disabled")

-                                }

-                                if (r.datas.applybill_status == 1){

-                                    $(".j-footer").hide();

-                                    $(".v-cell-input").attr("disabled","disabled");

-                                    $(".invoice-title").unbind("click");

-                                }

+        $(function () {

+          $.post("/jypay/invoice/available",{order_code:order_code},function(rr){

+          if(rr.status==0){

+            window.location.replace("/front/invoice/cantInvoice?f=upgrade")

+          }else{

+            $("body").show();

+            $.ajax({

+                url:"/jypay/invoice/show",

+                type:"POST",

+                data:{"order_code":order_code},

+                success:function (r) {

+                    if(r.status == "fail"){

+                        if (r.datas != ""){

+                            applybill_status = r.datas.applybill_status

+                						product_name = r.datas.product_type

+                						if (product_name == "历史数据"){  //历史数据

+                                $(".user-phone").attr("value",r.datas.user_phone)

+                                $(".user-mail").attr("value",r.datas.user_mail)

+							                  invoice.phoneStatus = true;

+                  							invoice.emailStatus = true;

+                  							$("#commit").removeAttr("disabled")

                             }

-                        }else{

-                            applybill_status = r.data.invoice_status,

-                            product_name = r.data.product_type

-                            if (r.data.invoice_status == -1){

-                                sys_err = -1

-                                if (r.data.invoice_type == "单位"){

-                                    $('.company-cell').show()

-                                    $('.invoice-value').text("单位")

-                                    $(".identification_number").attr("value",r.data.taxpayer_identnum)

-                                    $(".company_name").attr("value",r.data.company_name)

-                                    $(".user-phone").attr("value",r.data.phone)

-                                    $(".user-mail").attr("value",r.data.mail)

-                                    invoice.phoneStatus = true;

-                                    invoice.emailStatus = true;

-                                    invoice.cnameStatus = true;

-                                    invoice.codeStatus = true;

-                                    $(".j-button-confirm").removeAttr("disabled")

+                            if (r.datas.applybill_status == 1){

+                                $(".j-footer").hide();

+                                $(".v-cell-input").attr("disabled","disabled");

+                                $(".invoice-title").unbind("click");

+                            }

+                        }

+                    }else{

+                        applybill_status = r.data.invoice_status,

+                        product_name = r.data.product_type

+                        if (r.data.invoice_status == -1){

+                            sys_err = -1

+                            if (r.data.invoice_type == "单位"){

+                                $('.company-cell').show()

+                                $('.invoice-value').text("单位")

+                                $(".identification_number").attr("value",r.data.taxpayer_identnum)

+                                $(".company_name").attr("value",r.data.company_name)

+                                $(".user-phone").attr("value",r.data.phone)

+                                $(".user-mail").attr("value",r.data.mail)

+                                invoice.phoneStatus = true;

+                                invoice.emailStatus = true;

+                                invoice.cnameStatus = true;

+                                invoice.codeStatus = true;

+                                $(".j-button-confirm").removeAttr("disabled")

 

-                                }else{

-                                    $('.invoice-value').text("个人")

-                                    $(".user-phone").attr("value",r.data.phone);

-                                    $(".user-mail").attr("value",r.data.mail);

-                                    invoice.phoneStatus = true;

-                                    invoice.emailStatus = true;

-                                    $("#commit").removeAttr("disabled")

-                                }

                             }else{

-                                if (product_name == "历史数据"){

-                                    if (r.data.invoice_changed == 1){

+                                $('.invoice-value').text("个人")

+                                $(".user-phone").attr("value",r.data.phone);

+                                $(".user-mail").attr("value",r.data.mail);

+                                invoice.phoneStatus = true;

+                                invoice.emailStatus = true;

+                                $("#commit").removeAttr("disabled")

+                            }

+                        }else{

+                            if (product_name == "历史数据"){

+                                if (r.data.invoice_changed == 1){

+                                    if (r.data.invoice_type == "单位"){

+                                        $('.company-cell').show()

+                                        $('.invoice-value').text("单位")

+                                        $(".identification_number").attr("value",r.data.taxpayer_identnum)

+                                        $(".company_name").attr("value",r.data.company_name)

+                                        $(".user-phone").attr("value",r.data.phone)

+                                        $(".user-mail").attr("value",r.data.mail)

+                                        $(".v-cell-input").attr("disabled", "disabled");

+                                        $(".invoice-title").unbind("click");

+                                        $(".j-footer").hide()

+                                    }else{

+                                        $('.invoice-value').text("个人")

+                                        $(".user-phone").attr("value",r.data.phone)

+                                        $(".user-mail").attr("value",r.data.mail)

+                                        $(".v-cell-input").attr("disabled", "disabled");

+                                        $(".invoice-title").unbind("click");

+                                        $(".j-footer").hide()

+                                    }

+                                }else{

+                                    if (c==1){

+                                        if (r.data.invoice_type == "单位"){

+                                            /*$('.company-cell').show()

+                                            $('.invoice-value').text("单位")

+                                            $(".identification_number").attr("value",r.data.taxpayer_identnum)

+                                            $(".company_name").attr("value",r.data.company_name)

+                                            $(".user-phone").attr("value",r.data.phone)

+                                            $(".user-mail").attr("value",r.data.mail)*/

+                                            $('.invoice-value').text("个人")

+                                            $(".user-phone").attr("value",r.data.phone)

+                                            $(".user-mail").attr("value",r.data.mail)

+                                        }else{

+                                            $('.invoice-value').text("个人")

+                                            $(".user-phone").attr("value",r.data.phone)

+                                            $(".user-mail").attr("value",r.data.mail)

+

+                                        }

+                                    }else{

                                         if (r.data.invoice_type == "单位"){

                                             $('.company-cell').show()

                                             $('.invoice-value').text("单位")

@@ -202,6 +247,7 @@
 
                                             $(".invoice-title").unbind("click");

                                             $(".j-footer").hide()

                                         }else{

+

                                             $('.invoice-value').text("个人")

                                             $(".user-phone").attr("value",r.data.phone)

                                             $(".user-mail").attr("value",r.data.mail)

@@ -209,49 +255,39 @@
 
                                             $(".invoice-title").unbind("click");

                                             $(".j-footer").hide()

                                         }

+                                    }

+

+                                }

+                            }else{

+                                if (r.data.invoice_changed == 1){

+                                    if (r.data.invoice_type == "单位"){

+                                        $('.company-cell').show()

+                                        $('.invoice-value').text("单位")

+                                        $(".identification_number").attr("value",r.data.taxpayer_identnum)

+                                        $(".company_name").attr("value",r.data.company_name)

+                                        $(".user-phone").attr("value",r.data.phone)

+                                        $(".user-mail").attr("value",r.data.mail)

+                                        $(".v-cell-input").attr("disabled", "disabled");

+                                        $(".invoice-title").unbind("click");

+                                        $(".j-footer").hide()

                                     }else{

-                                        if (c==1){

-                                            if (r.data.invoice_type == "单位"){

-                                                /*$('.company-cell').show()

-                                                $('.invoice-value').text("单位")

-                                                $(".identification_number").attr("value",r.data.taxpayer_identnum)

-                                                $(".company_name").attr("value",r.data.company_name)

-                                                $(".user-phone").attr("value",r.data.phone)

-                                                $(".user-mail").attr("value",r.data.mail)*/

-                                                $('.invoice-value').text("个人")

-                                                $(".user-phone").attr("value",r.data.phone)

-                                                $(".user-mail").attr("value",r.data.mail)

-                                            }else{

-                                                $('.invoice-value').text("个人")

-                                                $(".user-phone").attr("value",r.data.phone)

-                                                $(".user-mail").attr("value",r.data.mail)

+                                        $('.invoice-value').text("个人")

+                                        $(".user-phone").attr("value",r.data.phone)

+                                        $(".user-mail").attr("value",r.data.mail)

+                                        $(".v-cell-input").attr("disabled", "disabled");

+                                        $(".invoice-title").unbind("click");

+                                        $(".j-footer").hide()

+                                    }

+                                }else{

+                                    if (c==1){

 

-                                            }

-                                        }else{

-                                            if (r.data.invoice_type == "单位"){

-                                                $('.company-cell').show()

-                                                $('.invoice-value').text("单位")

-                                                $(".identification_number").attr("value",r.data.taxpayer_identnum)

-                                                $(".company_name").attr("value",r.data.company_name)

-                                                $(".user-phone").attr("value",r.data.phone)

-                                                $(".user-mail").attr("value",r.data.mail)

-                                                $(".v-cell-input").attr("disabled", "disabled");

-                                                $(".invoice-title").unbind("click");

-                                                $(".j-footer").hide()

-                                            }else{

+                                        $('.company-cell').show()

+                                        $('.invoice-value').text("个人")

+                                        $('.company-cell').hide()

 

-                                                $('.invoice-value').text("个人")

-                                                $(".user-phone").attr("value",r.data.phone)

-                                                $(".user-mail").attr("value",r.data.mail)

-                                                $(".v-cell-input").attr("disabled", "disabled");

-                                                $(".invoice-title").unbind("click");

-                                                $(".j-footer").hide()

-                                            }

-                                        }

 

-                                    }

-                                }else{

-                                    if (r.data.invoice_changed == 1){

+

+                                    }else{

                                         if (r.data.invoice_type == "单位"){

                                             $('.company-cell').show()

                                             $('.invoice-value').text("单位")

@@ -270,49 +306,22 @@
 
                                             $(".invoice-title").unbind("click");

                                             $(".j-footer").hide()

                                         }

-                                    }else{

-                                        if (c==1){

-

-                                            $('.company-cell').show()

-                                            $('.invoice-value').text("个人")

-                                            $('.company-cell').hide()

-

-

-

-                                        }else{

-                                            if (r.data.invoice_type == "单位"){

-                                                $('.company-cell').show()

-                                                $('.invoice-value').text("单位")

-                                                $(".identification_number").attr("value",r.data.taxpayer_identnum)

-                                                $(".company_name").attr("value",r.data.company_name)

-                                                $(".user-phone").attr("value",r.data.phone)

-                                                $(".user-mail").attr("value",r.data.mail)

-                                                $(".v-cell-input").attr("disabled", "disabled");

-                                                $(".invoice-title").unbind("click");

-                                                $(".j-footer").hide()

-                                            }else{

-                                                $('.invoice-value').text("个人")

-                                                $(".user-phone").attr("value",r.data.phone)

-                                                $(".user-mail").attr("value",r.data.mail)

-                                                $(".v-cell-input").attr("disabled", "disabled");

-                                                $(".invoice-title").unbind("click");

-                                                $(".j-footer").hide()

-                                            }

-                                        }

-

                                     }

 

                                 }

-                                invoice.checkCName();

-                                invoice.checkCode();

-                            }

 

+                            }

+                            invoice.checkCName();

+                            invoice.checkCode();

                         }

 

                     }

-                })

 

-            })

+                }

+              })

+            }

+          })

+        })

         var invoice = {

             reg:{

                 tel:/^1[3456789]{1}\d{9}$/,