zhuyiyi 10 månader sedan
förälder
incheckning
6396cbe640
3 ändrade filer med 11 tillägg och 17 borttagningar
  1. 5 15
      SiteCore/Handler/sync.order.cs
  2. 5 1
      Web/EDelivery/js/ChangeDelivery.js
  3. 1 1
      Web/EOrder/js/p_order.js

+ 5 - 15
SiteCore/Handler/sync.order.cs

@@ -4186,9 +4186,7 @@ namespace SiteCore.Handler
             string tid = GetPostString("ctid");
             if (tid.Length > 0)
             {
-                string select_tid = getTidByCtid(tid);
-
-                lw.Add(string.Format("tid='{0}'", select_tid));
+                if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%') ", tid));
             }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick='{0}'", shopname));
@@ -4267,9 +4265,8 @@ namespace SiteCore.Handler
             string tid = GetPostString("ctid");
             if (tid.Length > 0)
             {
-                string select_tid = getTidByCtid(tid);
+                lw.Add(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%') ", tid));
 
-                lw.Add(string.Format("tid='{0}'", select_tid));
             }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick='{0}'", shopname));
@@ -4346,12 +4343,8 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0)
-            {
-                string select_tid = getTidByCtid(tid);
+            if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%') ", tid));
 
-                lw.Add(string.Format("tid='{0}'", select_tid));
-            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick='{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -5146,9 +5139,8 @@ namespace SiteCore.Handler
             {
                 if (tid.Length > 0)
                 {
-                    string select_tid = getTidByCtid(tid);
+                    lw.Add(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%')", tid));
 
-                    lw.Add(string.Format("tid='{0}'", select_tid));
                 }
                 if (buyernick.Length > 0)
                     lw.Add(string.Format("buyer_nick='{0}'", buyernick));
@@ -5244,9 +5236,7 @@ namespace SiteCore.Handler
             {
                 if (tid.Length > 0)
                 {
-                    string select_tid = getTidByCtid(tid);
-
-                    lw.Add(string.Format("tid='{0}'", select_tid));
+                    lw.Add(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%')", tid));
 
                 }
                 if (buyernick.Length > 0)

+ 5 - 1
Web/EDelivery/js/ChangeDelivery.js

@@ -152,7 +152,11 @@ function actionRenderer(e) {
         html += getGridBtn("edit", "成本登记", "showPriceWin('" + ctid + "','" + record.payment_cyt + "','" + record.SupplierName + "')");
     }
     if (!!record.attachments) {
-        html += getGridBtn("view", "下载附件", "downAddressFile('" + record.attachments + "')");
+        let url = record.attachments;
+        if (url.indexOf("http:") == -1 && url.indexOf("https:") == -1) {
+            url = "https://dfdiyfile.oss-cn-fuzhou.aliyuncs.com/" + url;
+        }
+        html += getGridBtn("view", "下载附件", "downAddressFile('" + url + "')");
     }
     return html;
 }

+ 1 - 1
Web/EOrder/js/p_order.js

@@ -46,7 +46,7 @@ function orderAction(e) {
     if (record.OrderState == -1) {
         html += getGridBtn("memo2", "通过审核", "passToOrder('" + id + "')");
     }
-    if (record.seller_memo.indexOf("S_") > -1) {
+    if (record.ctid.indexOf("S_") > -1) {
         if (userPostCode == "AfterSaleMaster" || userPostCode == "SysAdmin" || userPostCode == "AfterSale" || userId == "82" || userId == "2846") {
             html += getGridBtn("memo", "处理完成", "finishOrder('" + id + "')");
         }