From 641ddf669ad57fb544e13a6433aa5905551b3bba Mon Sep 17 00:00:00 2001
From: CB2-20200827ONU\Administrator <liaoxujun@qq.com>
Date: 星期三, 22 九月 2021 09:04:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project

---
 CY_ECommercePlatform/CY.WebForm/js/business/Order.js |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index a026060..8cf007d 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -418,7 +418,9 @@
 function printTypeChange(sel) {
     showWait();
     var OldOrderId = document.getElementById('txtKeyid').value;
-    if (sel.value == -1 || sel.value == "-1") {//鍏朵粬绫诲瀷
+    if (sel.value == -1 || sel.value == "-1")
+    {
+        //鍏朵粬绫诲瀷
         $("#hidOrderId").val(OldOrderId);
         $("#divInquiry").load("/Pages/front/OtherType.aspx", { "PrintTypeId": "-1" });
         setTimeout(function () {
@@ -428,10 +430,14 @@
         }, 1000);
        
         window.hideWaitDiv = window.parent.parent.parent.parent.parent.parent.hideWaitDiv;
-        if (window.hideWaitDiv) window.hideWaitDiv();
-    } else {
+        if (window.hideWaitDiv)
+            window.hideWaitDiv();
+    }
+    else
+    {
         DelayLoadPrintType(sel.value, '1', OldOrderId, 'order');
     }
+
     document.getElementById('hidPrintTypeId').value = sel.value;
     if ($("#txtKeyid").val() == "0") {
         //document.getElementById('txtDocumentName').value = sel.value ? sel.options[sel.selectedIndex].text : '';
@@ -439,9 +445,9 @@
     if (sel.value == 6) {
         document.getElementById('trbook').style.display = '';
         var sselCustormer = document.getElementById('selCustormer').value;
-        if (sselCustormer != null && sselCustormer != '') {
+        if (sselCustormer != null && sselCustormer != '')
+        {
            
-             
                 //CallServer({ Target: "getPrintAsk", id: sselCustormer }, function (data, textStatus) {
                 //    alert(sselCustormer);
                 //    var jobj = false;

--
Gitblit v1.9.1