edit

SiteCore/taobao/apiCaiYingTong.cs

@@ -533,11 +533,7 @@ namespace SiteCore.Handler
                     if (isAll)
                     {
                         entity.AfterSaleState = 4;
-                        entity.FinishAfterSaleTime = DateTime.Now;
-                        if (entity.AfterSaleResSupId > 0)
-                        {
-                            entity.AfterSaleSupplierState = 1;
-                        }
+                        entity.AfterSaleSupplierState = 1;
                     }
                 }
                 else
@@ -556,7 +552,7 @@ namespace SiteCore.Handler
                         ceErpTradeAfterSaleExtend.Create();
                     }
 
-                    entity.AfterSaleState = 2;
+                    entity.AfterSaleState = 1;
                 }
                 if (entity.AfterSaleState == 4)
                 {

SiteCore/taobao/apiDesign.cs

@@ -668,7 +668,7 @@ namespace SiteCore.Handler
                             ceErpTradeCell.StartDesignTime = DateTime.Now;
                         }
                         ceErpTradeCell.Update();
-                        LogHelper.addLog(ceErpTradeCell.ctid, CurrentUser.UserID, "接口请求：" + orderState, ceErpTradeCell.OrderState);
+                        LogHelper.addLog(ceErpTradeCell.ctid, 3542, "接口请求：" + orderState, ceErpTradeCell.OrderState);
                         commonHelper.UpdateRelationOrder(tid);
                         return;
                     }
@@ -737,7 +737,7 @@ namespace SiteCore.Handler
                 {
                     ct.Create();
                 }
-                LogHelper.addLog(ce.ctid, CurrentUser.UserID, "接口请求修改：" + content, ce.OrderState);
+                LogHelper.addLog(ce.ctid, 3542, "接口请求修改：" + content, ce.OrderState);
                 returnSuccessMsg("保存成功!");
             }
         }
@@ -766,7 +766,7 @@ namespace SiteCore.Handler
                 entity.ReturnTime = DateTime.Now;
                 entity.ReturnReason = content;
                 entity.Update();
-                LogHelper.addLog(entity.ctid, CurrentUser.UserID, "接口打回：" + content, entity.OrderState);
+                LogHelper.addLog(entity.ctid, 3542, "接口打回：" + content, entity.OrderState);
                 returnSuccessMsg("保存成功!");
                 return;
             }

SiteCore/taobao/preSalesHelper.cs

@@ -5,6 +5,7 @@ using NHibernate.Engine;
 using NPOI.OpenXmlFormats.Shared;
 using NPOI.OpenXmlFormats.Wordprocessing;
 using NPOI.SS.Formula.Functions;
+using NPOI.SS.Formula.PTG;
 using SiteCore.Handler;
 using SiteCore.taoObj;
 using SQLData;
@@ -180,6 +181,8 @@ namespace SiteCore.Handler
                             string emsg = commonHelper.KeepChinese(apires);
                             errmsg += emsg;
                         }
+                        LogHelper.addLog(dr["ctid"].ToString(), UserID, "售前：" + errmsg, 0, 1);
+
                     }
 
 
@@ -226,7 +229,7 @@ namespace SiteCore.Handler
                     //entity.AfterSaleReason = reason;
                     entity.AfterSaleTime = DateTime.Now;
                     entity.Update();
-                    LogHelper.addLog(entity.ctid, UserID, name + "标记售后-" + reason, entity.OrderState, 1);
+                    LogHelper.addLog(entity.ctid, UserID, name + "售前标记售后-" + reason, entity.OrderState, 1);
                     returnSuccessMsg("转售后成功！");
                     return;
                 }
@@ -503,11 +506,13 @@ namespace SiteCore.Handler
                             returnErrorMsg(dr["ctid"] + "财务要求已下单已发货无法重置");
                             return;
                         }
+                        LogHelper.addLog(dr["ctid"].ToString(), UserID, "售前：订单重置", 0, 1);
                     }
                 }
                 CeErpTradeCell.ExecuteNonQuery("delete from CE_ErpTradeCell where tid='" + eid + "'");
                 CeErpTrade.ExecuteNonQuery("delete from CE_ErpTrade where tid='" + eid + "'");
                 CeErpTradeOrder.ExecuteNonQuery("delete from CE_ErpTradeOrder where tid='" + eid + "'");
+
                 returnSuccessMsg("重置成功！");
                 CeErpDesignerBill desginBill = CeErpDesignerBill.GetByTid(eid);
                 if (desginBill != null)
@@ -1115,7 +1120,7 @@ namespace SiteCore.Handler
                     }
 
 
-                    LogHelper.addLog(entity.ctid, CurrentUser.UserID, "申请发票", entity.OrderState, 1);
+                    LogHelper.addLog(entity.ctid, 11, "申请发票", entity.OrderState, 1);
                     returnSuccessMsg("发票申请成功！");
                     return;
                 }

Web/EFinance/StayGoods.aspx

@@ -23,7 +23,7 @@
 
 <asp:Content ID="Content4" ContentPlaceHolderID="content" runat="Server">
     <div class="mini-fit">
-        <div id="m_grid" class="mini-datagrid" style="width: 100%; height: 100%;" showemptytext="true" emptytext="暂无记录" url="../handler/sync.ashx?t=get_erp_staygoods">
+        <div id="m_grid" class="mini-datagrid" style="width: 100%; height: 100%;" contextmenu="#gridMenu" showemptytext="true" emptytext="暂无记录" url="../handler/sync.ashx?t=get_erp_staygoods">
             <div property="columns">
                 <div type="checkcolumn" width="20"></div>
                 <div field="tid" width="90" align="center" headeralign="center" renderer="orderIdRenderer">订单编号</div>
@@ -48,6 +48,9 @@
         </div>
     </div>
     <div class="image_large" onclick="hideImage(this)"></div>
-
+    <ul id="gridMenu" class="mini-contextmenu" onbeforeopen="onBeforeOpen">
+        <li name="edit" iconcls="icon-copy" onclick="onCopyOrder">复制单号</li>
+        <li name="edit" iconcls="icon-copy" onclick="onCopyBuyerNick">复制旺旺号</li>
+    </ul>
 </asp:Content>
 

Web/EFinance/js/StayGoods.js

@@ -89,13 +89,21 @@ function orderStatusRenderer(e) {
 }
 function rTypeRenderer(e) {
     var record = e.record;
-    console.log(record);
     var html = "<div style=\"display:flex;flex-direction:column;\">";
     html += ("<div>" + (record.stay_type) + "</div>");
     html += "</div>";
     return html;
 }
-
+function onCopyOrder(e) {
+    var rec = grid.getSelected();
+    //rec.ctid
+    copyTextPlus(rec.ctid);
+}
+function onCopyBuyerNick(e) {
+    var rec = grid.getSelected();
+    //rec.ctid
+    copyTextPlus(rec.wangwang);
+}
 //点击审核按钮
 function verifyFn(id) {
     var rec = grid.getSelected();