修改系统报价

BizCom/Dao/CeErpTradeCellExtend.cs

@@ -504,6 +504,28 @@ namespace BizCom
             get { return _sysPriceContent; }
             set { _sysPriceContent = value; }
         }
+
+        private double _sysDiffPrice = 0;
+        /// <summary>
+        /// 差额
+        /// </summary>
+        [Property]
+        public double sysDiffPrice
+        {
+            get { return _sysDiffPrice; }
+            set { _sysDiffPrice = value; }
+        }
+
+        private double _sysPriceRate = 0;
+        /// <summary>
+        /// 折扣
+        /// </summary>
+        [Property]
+        public double sysPriceRate
+        {
+            get { return _sysPriceRate; }
+            set { _sysPriceRate = value; }
+        }
         public static CeErpTradeCellExtend getByTid(string ctid)
         {
             return FindFirst(Expression.Sql(string.Format("ctid='{0}'", ctid)));

SiteCore/taobao/dataHelper.cs

@@ -416,6 +416,7 @@ namespace SiteCore.Handler
                     }
                     ce.sysPrice = price;
                     ce.sysPriceContent = sysPriceContent;
+
                     string sql = string.Format("select ptid,payment from CE_ErpTradeCell where ptid ='{0}' and  IsSample = 2", ceErpTradeCell.tid);
                     DataTable dt_price = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
                     if (dt_price != null && dt_price.Rows.Count > 0)
@@ -430,6 +431,11 @@ namespace SiteCore.Handler
                         }
                         ce.differentAmount = diffPirce;
                     }
+                    ce.sysDiffPrice = ce.differentAmount + ceErpTradeCell.payment - price;
+                    if (price != 0)
+                    {
+                        ce.sysPriceRate = Math.Round((ce.differentAmount + ceErpTradeCell.payment) / price * 100, 2);
+                    }
                     if (ce.ID != 0)
                     {
                         ce.Update();
@@ -438,9 +444,9 @@ namespace SiteCore.Handler
                     {
                         ce.Create();
                     }
-                    returnSuccessMsg("修改成功！");
-                    return;
                 }
+                returnSuccessMsg("修改成功！");
+                return;
             }
 
             returnErrorMsg("缺少必要参数");

Web/EDelivery/WaitingOrder.aspx

@@ -36,17 +36,17 @@
                 <div field="SupplierName" width="60" align="center" headeralign="center">供应商</div>
                 <div field="payment" width="40" align="center" headeralign="center">金额</div>
                 <div field="compenPrice" width="60" align="center" headeralign="center">补差金额</div>
-                <div field="sysPrice" width="60" align="center" headeralign="center">报价金额</div>
-                <div field="payment_cyt" width="80" align="center" headeralign="center">成本金额</div>
+                <div field="sysPrice" width="80" align="center" headeralign="center" renderer="sysPriceRenderer">系统金额</div>
+                <!--<div field="payment_cyt" width="80" align="center" headeralign="center">成本金额</div>-->
                 <div field="delivery_paymant" width="40" align="center" headeralign="center">偏远物流费</div>
                 <div field="CustomerUserName" width="60" align="center" headeralign="center" renderer="orderCusRenderer">客服/设计</div>
                 <div field="seller_memo" width="200" align="center" headeralign="center" renderer="memoRenderer">备注</div>
-                <div field="OtherMemo" width="100" align="center" headeralign="center">额外备注</div>
+                <div field="OtherMemo" width="80" align="center" headeralign="center">额外备注</div>
                 <%--<div field="Img" width="30" align="center" headeralign="center" renderer="ImgRenderer">图片</div>--%>
                 <div field="OrderState" width="50" align="center" headeralign="center" renderer="orderStatusRenderer">状态</div>
                 <div field="receiver_address" width="80" align="center" headeralign="center">收货地址</div>
                 <div field="FinishDesignTime" width="60" dateformat="yyyy-MM-dd HH:mm" align="center" headeralign="center">设计完成时间</div>
-                <div field="IsVerifyToSupplier" width="50" align="center" headeralign="center" renderer="verifyStateRenderer">审核状态</div>
+                <!--<div field="IsVerifyToSupplier" width="50" align="center" headeralign="center" renderer="verifyStateRenderer">审核状态</div>-->
                 <%--<div field="MakeSupplier" width="60" align="center" headeralign="center" >制作车间</div>--%>
                 <div name="action" width="80" headeralign="center" align="center" renderer="actionRenderer" cellstyle="padding:0;">#</div>
             </div>

Web/EDelivery/js/WaitingOrder.js

@@ -122,6 +122,18 @@ function orderCusRenderer(e) {
     return html;
 }
 
+function sysPriceRenderer(e) {
+    var grid = e.sender;
+    var record = e.record;
+
+    var html = "<div style=\"display:flex;flex-direction:column;align-items:center;\">";
+    html += ("<div> 系统金额:" + record.sysPrice || 0 + "</div>");
+    html += ("<div>差额:" + record.sysDiffPrice || 0 + "</div>");
+    html += ("<div>折扣:" + record.sysPriceRate || 0 + "</div>");
+    html += "</div>";
+    return html;
+}
+
 function addressRenderer(e) {
     var grid = e.sender;
     var record = e.record;

Web/EOrder/OrderList.aspx

@@ -135,6 +135,8 @@
                 <div field="DesignPrice" visible="false" align="center" headeralign="center">设计费</div>
                 <div field="differentAmount" visible="false" align="center" headeralign="center">补差金额</div>
                 <div field="sysPrice" visible="false" align="center" headeralign="center">系统报价</div>
+                <div field="sysDiffPrice" visible="false" align="center" headeralign="center">差额</div>
+                <div field="sysPriceRate" visible="false" align="center" headeralign="center">折扣</div>
                 <div field="end_time" visible="false" align="center" headeralign="center">确认收货时间</div>
 
                 <div field="WaitDesignTime" visible="false" align="center" headeralign="center">指派时间</div>