修改线下审核人，部分店铺退回erp

SiteCore/taobao/commonHelper.cs

@@ -3187,7 +3187,7 @@ namespace SiteCore
                 return;
             }
 
-            string sql = string.Format("SELECT count(*) as number FROM [dbo].[Ce_ErpTrade] WITH(NOLOCK) WHERE (buyer_nick = '{0}' or buyer_id = '{1}' ) and status = 'COMPLETE' and seller_nick = '{2}' and tid <> '{3}'", ceErpTrade.buyer_nick, ceErpTrade.buyer_id, ceErpTrade.seller_nick, ceErpTrade.tid);
+            string sql = string.Format("SELECT count(*) as number FROM [dbo].[Ce_ErpTrade] WITH(NOLOCK) WHERE (buyer_nick = '{0}' or buyer_id = '{1}' ) and status = 'COMPLETE' and seller_nick = '{2}' and tid <> '{3}' AND end_time < '{4}'", ceErpTrade.buyer_nick, ceErpTrade.buyer_id, ceErpTrade.seller_nick, ceErpTrade.tid, ceErpTrade.pay_time);
             DataTable dataTable = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
             if (dataTable != null && dataTable.Rows.Count > 0)
             {

SiteCore/taobao/tmcHelper.cs

@@ -390,7 +390,7 @@ namespace SiteCore
 
         static List<string> postcodes = new List<string>()
         {
-           "yujia","taolai","zhufan","dingyi","lingtao","yangguangmao","xinkeli","yuejia","xiyinshuo","SP","zhuosheng","aolifu","GQ"
+           "yujia","taolai","zhufan","dingyi","lingtao","yangguangmao","xinkeli","yuejia","xiyinshuo","SP"
         };
 
         public static void Api_TmcTradeMsg(string res)

Web/EOrder/js/p_order.js

@@ -997,7 +997,7 @@ $(function () {
             if (fileInfo == undefined || fileInfo == null) { alert("上传发生错误!"); }
             if (fileInfo.result.res == "1") {
                 $("#hImg").val(fileInfo.result.msg);
-                $("#preview_img").attr("src", viewUrl + "/" + fileInfo.result.msg);
+                $("#preview_img").attr("src", viewUrl + "/" + new Date().format("yyyyMM") + "/" + fileInfo.result.msg);
             }
         },
         onUpload: function (obj) {
@@ -1240,8 +1240,7 @@ function viewCdrImg(id) {
 
 function viewPayImg(id) {
     var rec = grid.getSelected();
-
-    var url = viewUrl + "/" + rec.PayProofImg;
+    var url = viewUrl + "/" + new Date(rec.pay_time).format("yyyyMM") + "/" + rec.PayProofImg;
     mini.get("payimg_win").show();
     $("#p_img").attr("src", url);
 }
@@ -1292,6 +1291,9 @@ function orderStatusRenderer(e) {
     if (record.OrderState == 5 && record.IsVerifyToSupplier == "True") {
         supplier_down = "车间待下载"
     }
+    if (record.OrderState == -1 && record.ctid.indexOf("N_") > -1) {
+        statestr = "财务" + statestr;
+    }
     html += ("<div onclick=\"clickToLog('" + record.ctid + "')\" style=\"color:" + (record.OrderState == 0 ? "red" : "blue") + ";margin-bottom:10px;\">" + statestr + "</div>");
     html += ("<div style=\"color:red;\">" + supplier_down + "</div>");
     html += ("<div>" + taostatus + "</div>");