zhuyiyi 9 months ago
parent
commit
55b811b20a

+ 2 - 1
SiteCore/Handler/sync.order.cs

@@ -153,7 +153,7 @@ namespace SiteCore.Handler
             string deliverydate = GetDateMinuteWhere("FinishDeliveryTime", deliverydate1, deliverydate2);
             if (deliverydate.Length > 0)
             {
-                lw.Add(string.Format("( delivery_time BETWEEN '{0}' AND '{1}' ) OR ( FinishDeliveryTime BETWEEN '{0}' AND '{1}' )", deliverydate1, deliverydate2));
+                lw.Add(string.Format("( delivery_time BETWEEN '{0}' AND '{1}' ) ", deliverydate1, deliverydate2));
             };
 
             string shopname = GetPostString("shopname");
@@ -11029,6 +11029,7 @@ namespace SiteCore.Handler
                 StringBuilder sql = new StringBuilder();
                 sql.AppendFormat("select type,UserId,ID,OrgPath,OrgID from view_ErpTradeResponsible where tid='{0}' and VerifyState > -1", ctid);
                 DataTable dt = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
+                CeErpTradeResponsible.DelByTid(ctid, 0);
                 if ((ceErpTradeCell.AfterSaleResponsible.IndexOf("客户问题") != -1 && ceErpTradeCell.AfterSaleResponsible.IndexOf(",客户问题") == -1) || (ceErpTradeCell.AfterSaleResponsible.IndexOf("系统问题") != -1 && ceErpTradeCell.AfterSaleResponsible.IndexOf(",系统问题") == -1) || ceErpTradeCell.supRefundType == "正常损耗" || ceErpTradeCell.supRefundType == "车间不售后" || ceErpTradeCell.supRefundType == "不售后" || ceErpTradeCell.supRefundType == "不理赔")
                 {
                     CeErpTradeResponsible.DelByTid(ctid, 1);

+ 2 - 2
SiteCore/taobao/commonHelper.cs

@@ -94,7 +94,7 @@ namespace SiteCore
                     if (type == 2)
                     {
                         DateTime date = DateTime.Parse(dr["VerifyTime"].ToString());
-                        if (DateTime.Compare(DateTime.Now, date.AddHours(96)) > 0)
+                        if (DateTime.Compare(DateTime.Now, date.AddHours(96)) <= 0)
                         {
                             continue;
                         }
@@ -259,7 +259,7 @@ namespace SiteCore
             //    XLog.SaveLog(0, "autoDistributeToSupplier:获取数量[" + trade.ProductCount + "]转换出错");
             //}
             //老客户指派之前供应商
-            if (trade.IsOldCustomer == 1 && trade.seller_memo.IndexOf("改稿") != -1)
+            if (trade.IsOldCustomer == 1 && (trade.seller_memo.IndexOf("改稿") != -1 || trade.OtherMemo.IndexOf("老客户") != -1))
             {
                 CeErpTrade ceErpTrade = CeErpTrade.Get(trade.tid);
 

+ 1 - 0
SiteCore/taobao/refundTmcHelper.cs

@@ -266,6 +266,7 @@ namespace SiteCore
                                 refund.modified = StampToDateTime(tObj.updateTime);
                             }
                             refund.order_status = tObj.orderStatus;
+                            refund.status = tObj.status;
                             refund.Update();
                             int rstate = commonHelper.getRefundTagByState(tObj.status);
                             string rstateWord = commonHelper.getRefundStringByState(tObj.status);

+ 1 - 0
Web/EDesign/MyReDesign.aspx

@@ -97,6 +97,7 @@
                 <div field="OrderState" width="40" align="center" headeralign="center" renderer="orderStatusRenderer">状态</div>
                 <div field="restatus" width="50" align="center" headeralign="center" renderer="orderReStatusRenderer">退款状态</div>
                 <div field="DesignUserName" width="60" align="center" headeralign="center">设计师</div>
+                <div field="orgName" width="60" align="center" headeralign="center">团队</div>
                 <div field="RefundMemo" width="80" align="center" headeralign="center">标记说明</div>
                 <div field="created" width="60" align="center" headeralign="center" renderer="createTimeRenderer">退款时间</div>
                 <div name="action" width="80" headeralign="center" align="center" renderer="actionRenderer" cellstyle="padding:0;">#</div>

+ 1 - 2
Web/EDesign/MyReDesign.aspx.cs

@@ -17,10 +17,9 @@ public partial class EDesign_MyReDesign : BasePage
         _repTitle = "退款列表";
         PmTag = "myReDesign";
         //_selfCheckPermission = true;
+        _filterItem = "order,shop,memo,wang,moeny,responsible_man,refund_time";
         _keyFilterVisible = false;
         _addVisible = false;
-        _filterItem = "order,shop,memo,wang,moeny,responsible_man,refund_time,ispartrefund";
-        _filterDateBtn = false;
     }
 
     protected void Page_Load(object sender, EventArgs e)

+ 80 - 3
Web/EDesign/js/myReDesign.js

@@ -98,7 +98,7 @@ function partRenderer(e) {
     if (record.IsPartRefund == 1) {
         html += ("<div style='color:blue;'>部分</div>");
     }
-  
+
     return html;
 }
 
@@ -166,7 +166,7 @@ function setTagFn(eid) {
     var ww = ("<a class='marginleft20' href='http://amos.alicdn.com/msg.aw?v=2&amp;uid=" + rec.buyer_nick + "&amp;site=cntaobao&amp;s=2&amp;charset=utf-8' target='ww'><img border='0' src='http://amos.alicdn.com/online.aw?v=2&amp;uid=" + rec.buyer_nick + "&amp;site=cntaobao&amp;s=2&amp;charset=utf-8' alt='点击这里给我发消息'><span id = 'customerName' >" + rec.buyer_nick + "</span></a >");
     ohtml += ww;
     $("#txtTid").html(ohtml);
-    
+
     $("#txtAfterMemo").val(rec.Memo);
 }
 function cancelHandleFn() {
@@ -222,7 +222,7 @@ function searchFn() {
     //form.setIsValid(false);
     //console.log("565656565", data);
     grid.load({
-        tid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, orderState: s.state,ispartrefund: s.ispartrefund,
+        tid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, orderState: s.state, ispartrefund: s.ispartrefund,
         date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, seller_memo: s.memo, refunddate1: s.refunddate1, refunddate2: s.refunddate2, responsibleman: s.responsibleman
     });
 }
@@ -232,7 +232,84 @@ function clearFn() {
     var form = new mini.Form("#ctl00_f_all");
     form.clear();
 }
+function onSearchCheckedChanged(e) {
+    var btn = e.sender;
+    var checked = btn.getChecked();
+    var text = btn.getText();
+    var form = new mini.Form("#ctl00_f_all");
+    var data = form.getData(true, false);
+    var s = data;
+
+    if (checked) {
+        var stime = "";
+        var etime = "";
+        var timearr = [];
+        if (text == "本日") {
+            let currentTime = new Date();
+            let start = new Date(currentTime.getFullYear(), currentTime.getMonth(), currentTime.getDate(), 0, 0, 0);
+            let end = new Date(currentTime.getFullYear(), currentTime.getMonth(), currentTime.getDate(), 23, 59, 59);
+            timearr.push(formatDate(start));
+            timearr.push(formatDate(end));
+        }
+        else if (text == "本周") {
+            timearr = getWeekStartEnd();
+        }
+        else if (text == "本月") {
+            timearr = getMonthStartEnd();
+        }
+        console.log(timearr)
+        stime = timearr[0];
+        etime = timearr[1];
+        grid.load({
+            tid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, orderState: s.state, ispartrefund: s.ispartrefund,
+            refunddate1: stime, refunddate2: etime, price1: s.price1, price2: s.price2, seller_memo: s.memo, responsibleman: s.responsibleman
+        });
+    }
+
+}
+
+function getWeekStartEnd() {
+    const now = new Date();
+    const dayOfWeek = now.getDay(); // 获取当前是周几,周日为0,周六为6
+    const startOfWeek = new Date(now);
+    const endOfWeek = new Date(now);
+
+    // 设置开始时间为本周一(如果周一不是每周的第一天,可以调整这里的逻辑)
+    startOfWeek.setDate(now.getDate() - dayOfWeek + (dayOfWeek === 0 ? -6 : 1)); // 如果周一是一周的第一天,则调整为-6;否则+1
+    startOfWeek.setHours(0, 0, 0, 0);
+    // 设置结束时间为周日
+    endOfWeek.setDate(now.getDate() + (7 - dayOfWeek)); // 从今天开始算起,加上剩余的天数直到周日
+    endOfWeek.setHours(23, 59, 59, 59);
+
+    return [formatDate(startOfWeek), formatDate(endOfWeek)]
+
+}
+
+function getMonthStartEnd() {
+    // 获取当前日期
+    const now = new Date();
 
+    // 设置日期为当月的第一天(即月初)
+    const firstDayOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+    firstDayOfMonth.setHours(0, 0, 0, 0);
+    // 设置日期为当月的最后一天(即月末)
+    const lastDayOfMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+    lastDayOfMonth.setHours(23, 59, 59, 59);
+
+    return [formatDate(firstDayOfMonth), formatDate(lastDayOfMonth)]
+
+}
+
+
+function formatDate(date) {
+    let year = date.getFullYear();
+    let month = (date.getMonth() + 1).toString().padStart(2, '0'); // 月份是从0开始的
+    let day = date.getDate().toString().padStart(2, '0');
+    let hours = date.getHours().toString().padStart(2, '0');
+    let minutes = date.getMinutes().toString().padStart(2, '0');
+    let seconds = date.getSeconds().toString().padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
 
 
 function newPageSearchFn() {

+ 1 - 3
Web/js/view.ex.js

@@ -475,9 +475,7 @@ function copyText(obj) {
     var div = obj;
     var rec = grid.getSelected();
     let text = div.innerText;
-    if (rec.type == "PDD") {
-        div.innerText = text + "《" + rec.ctid + "》";
-    }
+    div.innerText = text + "《" + rec.ctid + "》";
     if (document.body.createTextRange) {
         var range = document.body.createTextRange();
         range.moveToElementText(div);