edit

SiteCore/Handler/sync.order.cs

@@ -5981,6 +5981,10 @@ namespace SiteCore.Handler
             string afterdate2 = GetPostString("afterdate2");
             string afterDate = GetDateMinuteWhere("AfterSaleTime", afterdate1, afterdate2);
             if (afterDate.Length > 0) lw.Add(afterDate);
+            string backdate1 = GetPostString("backdate1");
+            string backdate2 = GetPostString("backdate2");
+            string backDate = GetDateMinuteWhere("DisagreeTime", backdate1, backdate2);
+            if (backDate.Length > 0) lw.Add(backDate);
 
             string supplier = GetPostString("supplier");
             if (supplier.Length > 0) lw.Add(string.Format("SupplierName = '{0}'", supplier));
@@ -6922,10 +6926,13 @@ namespace SiteCore.Handler
                         returnErrorMsg("客户售后结果不能为空或不能为待处理！");
                         return;
                     }
+                    string numSql = string.Format("SELECT COUNT ( * ) AS BackNum FROM dbo.Ce_ErpTradeAfterSaleLog WHERE tid = '{0}' AND Con in ('责任主管不认可','供应商不认可')", entity.ctid);
+                    DataTable dt = DbHelper.DbConn.ExecuteDataset(numSql).Tables[0];
+                    int num = Convert.ToInt32(dt.Rows[0]["BackNum"]);
 
                     entity.AfterSalePreTime = DateTime.Now;
                     //预完成给售后主管审核客户问题直接完成
-                    if (entity.AfterSaleState == 1 && ceErpTradeAfterSaleExtend.DisagreeTime != null)
+                    if (entity.AfterSaleState == 1 && ceErpTradeAfterSaleExtend.DisagreeTime != null && num <= 1)
                     {
                         if (DateTime.Compare(DateTime.Now.AddHours(-24), (DateTime)ceErpTradeAfterSaleExtend.DisagreeTime) == 0)
                         {
@@ -7521,14 +7528,7 @@ namespace SiteCore.Handler
                         if (ceErpTradeAfterSaleExtend != null)
                         {
                             ceErpTradeAfterSaleExtend.AfterSaleBackImg = image;
-                            if (entity.AfterSaleState == 1)
-                            {
-                                ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
-                            }
-                            else
-                            {
-                                ceErpTradeAfterSaleExtend.DisagreeTime = null;
-                            }
+                            ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
                             ceErpTradeAfterSaleExtend.Update();
                         }
                         else
@@ -7536,14 +7536,7 @@ namespace SiteCore.Handler
                             ceErpTradeAfterSaleExtend = new CeErpTradeAfterSaleExtend();
                             ceErpTradeAfterSaleExtend.tid = entity.ctid;
                             ceErpTradeAfterSaleExtend.AfterSaleBackImg = image;
-                            if (entity.AfterSaleState == 1)
-                            {
-                                ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
-                            }
-                            else
-                            {
-                                ceErpTradeAfterSaleExtend.DisagreeTime = null;
-                            }
+                            ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
                             ceErpTradeAfterSaleExtend.Create();
                         }
                     }
@@ -7617,14 +7610,7 @@ namespace SiteCore.Handler
                             if (ceErpTradeAfterSaleExtend != null)
                             {
                                 ceErpTradeAfterSaleExtend.AfterSaleBackImg = image;
-                                if (entity.AfterSaleState == 1)
-                                {
-                                    ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
-                                }
-                                else
-                                {
-                                    ceErpTradeAfterSaleExtend.DisagreeTime = null;
-                                }
+                                ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
                                 ceErpTradeAfterSaleExtend.Update();
                             }
                             else
@@ -7632,14 +7618,7 @@ namespace SiteCore.Handler
                                 ceErpTradeAfterSaleExtend = new CeErpTradeAfterSaleExtend();
                                 ceErpTradeAfterSaleExtend.tid = entity.ctid;
                                 ceErpTradeAfterSaleExtend.AfterSaleBackImg = image;
-                                if (entity.AfterSaleState == 1)
-                                {
-                                    ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
-                                }
-                                else
-                                {
-                                    ceErpTradeAfterSaleExtend.DisagreeTime = null;
-                                }
+                                ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
                                 ceErpTradeAfterSaleExtend.Create();
                             }
                         }

Web/EAfterSale/DisagreeAfterSale.aspx.cs

@@ -19,7 +19,7 @@ public partial class EAfterSale_DisagreeAfterSale : BasePage
         //_selfCheckPermission = true;
         _keyFilterVisible = false;
         _addVisible = false;
-        _filterItem = "order,shop,cus,design,wang,reason,method,handleTime,handler,supplier,afterSaleMemo,aftersakereason";
+        _filterItem = "order,shop,cus,design,wang,reason,method,handleTime,handler,supplier,afterSaleMemo,aftersakereason,back_time";
         _filterDateBtn = false;
     }
 

Web/EAfterSale/js/DisagreeAfterSale.js

@@ -31,7 +31,7 @@ function searchMoreBack() {
     var s = data;
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, reason: s.reason, method: s.method, handledate1: s.handledate1, handledate2: s.handledate2, afterSaleMemo: s.afterSaleMemo, aftersakereason: s.aftersakereason,
-        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address,  seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "moreBack"
+        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "moreBack", backdate1: s.backdate1, backdate2: s.backdate2
     });
 }
 
@@ -41,7 +41,7 @@ function searchWaitFn() {
     var s = data;
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, reason: s.reason, method: s.method, handledate1: s.handledate1, handledate2: s.handledate2, afterSaleMemo: s.afterSaleMemo, aftersakereason: s.aftersakereason,
-        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 1, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "wait"
+        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 1, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "wait", backdate1: s.backdate1, backdate2: s.backdate2
     });
 }
 
@@ -51,7 +51,7 @@ function searchHandlingFn() {
     var s = data;
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, reason: s.reason, method: s.method, handledate1: s.handledate1, handledate2: s.handledate2, afterSaleMemo: s.afterSaleMemo, aftersakereason: s.aftersakereason,
-        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 1, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "handling"
+        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 1, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "handling", backdate1: s.backdate1, backdate2: s.backdate2
     });
 }
 function searchBackFn() {
@@ -60,7 +60,7 @@ function searchBackFn() {
     var s = data;
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, reason: s.reason, method: s.method, handledate1: s.handledate1, handledate2: s.handledate2, afterSaleMemo: s.afterSaleMemo, aftersakereason: s.aftersakereason,
-        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 1, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "back"
+        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 1, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "back", backdate1: s.backdate1, backdate2: s.backdate2
     });
 }
 function searchReviewedFn() {
@@ -69,7 +69,7 @@ function searchReviewedFn() {
     var s = data;
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, reason: s.reason, method: s.method, handledate1: s.handledate1, handledate2: s.handledate2, afterSaleMemo: s.afterSaleMemo, aftersakereason: s.aftersakereason,
-        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 2, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler
+        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 2, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, backdate1: s.backdate1, backdate2: s.backdate2
     });
 }
 function searchReBackFn() {
@@ -78,7 +78,7 @@ function searchReBackFn() {
     var s = data;
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, reason: s.reason, method: s.method, handledate1: s.handledate1, handledate2: s.handledate2, afterSaleMemo: s.afterSaleMemo, aftersakereason: s.aftersakereason,
-        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 2, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "reBack"
+        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 2, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "reBack", backdate1: s.backdate1, backdate2: s.backdate2
     });
 }
 function searchExamEdFn() {
@@ -87,7 +87,7 @@ function searchExamEdFn() {
     var s = data;
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, reason: s.reason, method: s.method, handledate1: s.handledate1, handledate2: s.handledate2, afterSaleMemo: s.afterSaleMemo, aftersakereason: s.aftersakereason,
-        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 3, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler
+        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 3, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, backdate1: s.backdate1, backdate2: s.backdate2
     });
 }
 function searchWaitExamFn() {
@@ -96,7 +96,7 @@ function searchWaitExamFn() {
     var s = data;
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, reason: s.reason, method: s.method, handledate1: s.handledate1, handledate2: s.handledate2, afterSaleMemo: s.afterSaleMemo, aftersakereason: s.aftersakereason,
-        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 2, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler
+        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 2, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, backdate1: s.backdate1, backdate2: s.backdate2
     });
 }
 function searchPuBackFn() {
@@ -105,7 +105,7 @@ function searchPuBackFn() {
     var s = data;
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, reason: s.reason, method: s.method, handledate1: s.handledate1, handledate2: s.handledate2, afterSaleMemo: s.afterSaleMemo, aftersakereason: s.aftersakereason,
-        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 1, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "puBack"
+        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: 1, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, searchType: "puBack", backdate1: s.backdate1, backdate2: s.backdate2
     });
 }
 
@@ -122,7 +122,7 @@ function searchFn() {
     //console.log("565656565", data);
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, reason: s.reason, method: s.method, handledate1: s.handledate1, handledate2: s.handledate2, supplier: s.supplier, afterSaleMemo: s.afterSaleMemo,
-        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: s.afterstate, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, aftersakereason: s.aftersakereason
+        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, afterstate: s.afterstate, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, handler: s.handler, aftersakereason: s.aftersakereason, backdate1: s.backdate1, backdate2: s.backdate2
     });
 
 }
@@ -135,7 +135,7 @@ $(function () {
         var s = openPageData;
         grid.load({
             ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, reason: s.reason, method: s.method, finishtime: s.finishtime, afterSaleMemo: s.afterSaleMemo,
-            date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype
+            date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, seller_memo: s.memo, afterdate1: s.afterdate1, afterdate2: s.afterdate2, aftermemotype: s.aftermemotype, backdate1: s.backdate1, backdate2: s.backdate2
         });
         var form = new mini.Form("#ctl00_f_all");
         if (form != undefined && form != null) {

Web/EAfterSale/js/Handling.js

@@ -39,6 +39,7 @@ function handTimeRenderer(e) {
     var html = "<div>";
     html += ("<div>售:" + formatCommonDate(record.AfterSaleTime) + "</div>");
     html += ("<div>处:" + formatCommonDate(record.HandleTime) + "</div>");
+    html += ("<div>回:" + formatCommonDate(record.DisagreeTime) + "</div>");
     html += "</div>";
     return html;
 }
@@ -1219,7 +1220,7 @@ function changeDuctPrice() {
                 price = Math.min($("#diffResultPrice").val(), price2);
 
             }
-            if (txtReason1 == "标错" || isUnAfter) {
+            if (txtReason2 == "标错" || isUnAfter) {
                 price = 0;
             }
             let isBad = $("#isBad").is(":checked");
@@ -1247,7 +1248,7 @@ function changeDuctPrice() {
             } else if (tradeCellPaymant >= 1000) {
                 price = 100.00;
             }
-            if (txtReason1 == "标错" || isUnAfter) {
+            if (txtReason2 == "标错" || isUnAfter) {
                 price = 0;
             }
             let isBad = $("#isBad").is(":checked");