修改售后显示逻辑

SiteCore/Handler/sync.order.cs

@@ -2948,7 +2948,10 @@ namespace SiteCore.Handler
                 {
                     sql.AppendFormat("select * from ce_erptradecell where CustomerUserId={0} and OrderState=0 and IsReadTag>0 ", userId);
                 }
-               
+                else if (posCode == "Place" || posCode == "PlaceMr")
+                {
+
+                }
                 else
                 {
                     string teamIds = CurrentUser.User.TeamIds;
@@ -2958,7 +2961,10 @@ namespace SiteCore.Handler
                     }
                     sql.AppendFormat("select * from ce_erptradecell where (DesignUserId={0} or DesignUserId in (select ID from view_erpuser where OnDuty=0 and ID in ({1}))) and OrderState in (3,4) and IsReadTag>0 ", userId, teamIds);
                 }
-                dt = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
+                if (sql.Length > 0)
+                {
+                    dt = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
+                }
             }
 
             if (dt.Rows.Count <= 0)
@@ -7460,7 +7466,6 @@ namespace SiteCore.Handler
                             //string second = memo_str.Substring(sIndex+1,memo_str.Length-sIndex-1);
                             string newMemo = first + memoCtid + last;
                             newentity.seller_memo = newMemo;
-
                             newentity.FinishPlaceTime = null;
                             newentity.UnusualTag = 0;
                             newentity.UnusualCon = "";

Web/EAfterSale/AllAfterSale.aspx

@@ -81,6 +81,7 @@
             <div field="CustomerBETb" width="40" align="center" headeralign="center">客服主管</div>
             <div field="DesignBETb" width="40" align="center" headeralign="center">设计主管</div>
             <div field="payment" width="50" align="center" headeralign="center" renderer="payRenderer">金额</div>
+            <div field="oriPayment" width="50" visible="false"  align="center" headeralign="center">原单金额</div>
             <div field="DeductFee" visible="false" width="80" align="center" headeralign="center">供应商扣款</div>            
             <div field="RefundFees" width="40" visible="false" align="center" headeralign="center">责任人扣款</div>
             <div field="AfterSaleReason1" width="40" align="center" headeralign="center">一级原因</div>

Web/EAfterSale/FinishAfterSale.aspx

@@ -57,6 +57,7 @@
             <div field="supplierResponsible" runat="server" id="id_supplierResponsible" visible="false" width="130" align="center" headeralign="center">车间方案</div>
             <div field="OrderState" name="orderstatus" width="50" align="center" headeralign="center" renderer="orderStatusRenderer">状态</div>
             <div field="payment" name="payment" id="id_payment" runat="server" visible="false" width="50" align="center" headeralign="center" renderer="payRenderer">金额</div>
+            <div field="oriPayment" width="50" visible="false"  align="center" headeralign="center">原单金额</div>
             <div field="AfterSaleResponsible" width="60" align="center" headeralign="center">责任人</div>
             <div field="AfterSaleSupplierImg" width="30" align="center" headeralign="center" renderer="ImgRenderer">图片</div>
             <div field="AfterSaleMemo" id="id_afterMemo" runat="server" visible="false" width="100" align="center" headeralign="center">售后备注</div>

Web/EAfterSale/js/Handling.js

@@ -1231,9 +1231,15 @@ function changeDuctPrice() {
             let isComplain = $("#isComplain option:selected").val();
             if (isComplain == 1) {
                 price = 200;
+                if (isBad) {
+                    price += 100;
+                }
             }
             if (isComplain == 2) {
                 price = 100;
+                if (isBad) {
+                    price += 100;
+                }
             }
 
             //另加5元
@@ -1259,9 +1265,15 @@ function changeDuctPrice() {
             let isComplain = $("#isComplain option:selected").val();
             if (isComplain == 1) {
                 price = 200;
+                if (isBad) {
+                    price += 100;
+                }
             }
             if (isComplain == 2) {
                 price = 100;
+                if (isBad) {
+                    price += 100;
+                }
             }
             if (txtReason1 == "设计问题" && txtReason3 == "未及时跟单" && handleRes != "催发货/改快递/改地址") {
                 price = Number(price) + 5;

Web/EAfterSale/js/WaitingVerify.js

@@ -205,7 +205,7 @@ function actionRenderer(e) {
 
     //供应商按钮
     if (record.AfterSaleResSupId > 0 && record.type == 1) {
-        if (record.AfterSaleState == 3 && record.AfterSaleSupplierState == 0) {
+        if (record.AfterSaleState == 3) {
             html += getGridBtn("sc", "认可", "verifyYes('" + record.ID + "')");
             html += getGridBtn("sc", "不认可", "verifyNo('" + record.ID + "')");
         }

Web/EDelivery/AllPlaceList.aspx

@@ -39,6 +39,7 @@
                 <div field="length" visible="false" align="center" headeralign="center">长</div>
                 <div field="quantity" visible="false" align="center" headeralign="center">数量</div>
                 <div field="numbers" visible="false" align="center" headeralign="center">款数</div>
+                <div field="payment" runat="server" width="150" align="center" headeralign="center">付款金额</div>
                 <div field="payment_cyt" id="id_payment_cyt" runat="server" width="150" align="center" headeralign="center" visible="false">成本价</div>
                 <div field="seller_memo" width="150" align="center" headeralign="center" renderer="memoRenderer">备注</div>
                 <div field="OtherMemo" width="100" align="center" headeralign="center">额外备注</div>