修改售后统计，新增尺寸单位

BizCom/Dao/CeErpProduct.cs

@@ -497,6 +497,14 @@ namespace BizCom
             get { return _uuid; }
             set { _uuid = value; }
         }
+
+        private string _sizeUnit = "";
+        [Property]
+        public string SizeUnit
+        {
+            get { return _sizeUnit; }
+            set { _sizeUnit = value; }
+        }
         public static void Del(object id)
         {
             StringBuilder sql = new StringBuilder();

SiteCore/Handler/sync.orderReport.cs

@@ -1702,7 +1702,7 @@ namespace SiteCore.Handler
             }
 
             StringBuilder sql = new StringBuilder();
-            sql.AppendFormat("SELECT o.AfterSaleUserId AS UserId, u.name AS UserName, COUNT(*) AS Total, COUNT(CASE WHEN o.AfterSaleState IN (2, 3) THEN 1 END) AS InProgress, COUNT(CASE WHEN o.AfterSaleState >= 4 THEN 1 END) AS Completed,COUNT ( CASE WHEN o.AfterSaleBackReason != '' THEN 1 END ) AS back, SUM ( a.ChangeNum ) AS ChangeNum ,SUM ( a.ReprintOut ) AS ReprintOut,SUM ( a.PreTimeOut ) AS PreTimeOut,SUM ( a.DisagreeTimeOut ) AS DisagreeTime   FROM CE_ErpTradeCell o LEFT JOIN Ce_ErpTradeAfterSaleExtend a ON a.tid = o.ctid INNER JOIN CE_ErpUser u ON o.AfterSaleUserId = u.ID WHERE   o.AfterSaleState >= 1 ");
+            sql.AppendFormat("SELECT o.AfterSaleUserId AS UserId, u.name AS UserName, COUNT(*) AS Total, COUNT(CASE WHEN o.AfterSaleState IN (2, 3) THEN 1 END) AS InProgress, COUNT(CASE WHEN o.AfterSaleState >= 4 THEN 1 END) AS Completed,COUNT ( CASE WHEN o.AfterSaleBackReason != '' THEN 1 END ) AS back, SUM ( a.ChangeNum ) AS ChangeNum ,SUM ( a.ReprintOut ) AS ReprintOut,SUM ( a.PreTimeOut ) AS PreTimeOut,SUM ( a.DisagreeTimeOut ) AS DisagreeTime  ,COUNT ( CASE WHEN a.IsBad > 0 THEN 1 END ) AS isBad,COUNT ( CASE WHEN a.IsComplain > 0 THEN 1 END ) AS isComplain  FROM CE_ErpTradeCell o LEFT JOIN Ce_ErpTradeAfterSaleExtend a ON a.tid = o.ctid INNER JOIN CE_ErpUser u ON o.AfterSaleUserId = u.ID WHERE   o.AfterSaleState >= 1 ");
             if (date1.Length > 0)
             {
                 sql.AppendFormat(" AND o.HandleTime >= '{0}'  AND o.HandleTime < '{1}'", date1, date2);
@@ -1725,6 +1725,8 @@ namespace SiteCore.Handler
             dt.Columns.Add(new DataColumn("DisagreeTime", typeof(string)));
             dt.Columns.Add(new DataColumn("ReprintOut", typeof(string)));
             dt.Columns.Add(new DataColumn("PreTimeOut", typeof(string)));
+            dt.Columns.Add(new DataColumn("isBad", typeof(string)));
+            dt.Columns.Add(new DataColumn("isComplain", typeof(string)));
             DataRow dr_he = dt.NewRow();
             dr_he[0] = "合计";
             dr_he[1] = 0;
@@ -1736,6 +1738,8 @@ namespace SiteCore.Handler
             dr_he[7] = 0;
             dr_he[8] = 0;
             dr_he[9] = 0;
+            dr_he[10] = 0;
+            dr_he[11] = 0;
             int total = 0;
             foreach (DataRow row in dtafter.Rows)
             {
@@ -1748,6 +1752,8 @@ namespace SiteCore.Handler
                 dr[7] = row["DisagreeTime"];
                 dr[8] = row["ReprintOut"];
                 dr[9] = row["PreTimeOut"];
+                dr[10] = row["isBad"];
+                dr[11] = row["isComplain"];
                 decimal rate = 0;
                 if (dr[1].ToString() != "0")
                 {
@@ -1770,6 +1776,8 @@ namespace SiteCore.Handler
                 dr_he[7] = Convert.ToDecimal(dr_he[7]) + Convert.ToDecimal(dr[7]);
                 dr_he[8] = Convert.ToDecimal(dr_he[8]) + Convert.ToDecimal(dr[8]);
                 dr_he[9] = Convert.ToDecimal(dr_he[9]) + Convert.ToDecimal(dr[9]);
+                dr_he[10] = Convert.ToDecimal(dr_he[10]) + Convert.ToDecimal(dr[10]);
+                dr_he[11] = Convert.ToDecimal(dr_he[11]) + Convert.ToDecimal(dr[11]);
                 total += Convert.ToInt32(row["back"]);
             }
             decimal pgrate = 0;
@@ -2028,7 +2036,7 @@ namespace SiteCore.Handler
 
             }
 
-            sql.AppendFormat("SELECT o.AfterSaleReason,p.PType, COUNT ( * ) AS total  FROM CE_ErpTradeCell o LEFT JOIN CE_ErpProduct p ON o.ProductId = p.id  WHERE o.AfterSaleState >= 1  {0} GROUP BY o.AfterSaleReason,p.PType", sqlDate);
+            sql.AppendFormat("SELECT o.AfterSaleReason,p.PType, COUNT ( * ) AS total ,COUNT ( CASE WHEN a.IsBad > 0 THEN 1 END ) AS isBad,COUNT ( CASE WHEN a.IsComplain > 0 THEN 1 END ) AS isComplain  FROM CE_ErpTradeCell o LEFT JOIN CE_ErpProduct p ON o.ProductId = p.id LEFT JOIN Ce_ErpTradeAfterSaleExtend a ON o.ctid = a.tid  WHERE o.AfterSaleState >= 1  {0} GROUP BY o.AfterSaleReason,p.PType", sqlDate);
             DataTable dtafter = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
 
             DataTable dt = new DataTable();
@@ -2038,6 +2046,8 @@ namespace SiteCore.Handler
             dt.Columns.Add(new DataColumn("AfterSaleReason3", typeof(string)));
             dt.Columns.Add(new DataColumn("total", typeof(string)));
             dt.Columns.Add(new DataColumn("rate", typeof(string)));
+            dt.Columns.Add(new DataColumn("isBad", typeof(string)));
+            dt.Columns.Add(new DataColumn("isComplain", typeof(string)));
             DataRow dr_he = dt.NewRow();
             dr_he[0] = "合计";
             dr_he[1] = 0;
@@ -2045,6 +2055,8 @@ namespace SiteCore.Handler
             dr_he[3] = 0;
             dr_he[4] = 0;
             dr_he[5] = 0;
+            dr_he[6] = 0;
+            dr_he[7] = 0;
             foreach (DataRow row in dtafter.Rows)
             {
                 string reason = row["AfterSaleReason"].ToString();
@@ -2066,6 +2078,8 @@ namespace SiteCore.Handler
                 }
                 dr[4] = row["total"];
                 dr[5] = 0;
+                dr[6] = row["isBad"];
+                dr[7] = row["isComplain"];
 
                 dt.Rows.Add(dr);
                 dr_he[4] = Convert.ToDecimal(dr_he[4]) + Convert.ToDecimal(dr[4]);
@@ -2181,7 +2195,7 @@ namespace SiteCore.Handler
 
             }
 
-            sql.AppendFormat("SELECT s.ShopName , COUNT ( * ) AS AllOrder, COUNT ( CASE WHEN o.AfterSaleState >= 1 THEN 1 END ) AS aftersaleOrder,COUNT ( CASE WHEN e.CheckOut > 0 THEN 1 END ) AS checkout  FROM CE_ErpTradeCell o LEFT JOIN Ce_ErpTradeCellExtend e ON o.ctid = e.ctid LEFT JOIN CE_ErpShop s ON o.ShopId = s.id  WHERE 1=1 {0}  GROUP BY s.ShopName", sqlDate);
+            sql.AppendFormat("SELECT s.ShopName , COUNT ( * ) AS AllOrder, COUNT ( CASE WHEN o.AfterSaleState >= 1 THEN 1 END ) AS aftersaleOrder,COUNT ( CASE WHEN e.CheckOut > 0 THEN 1 END ) AS checkout,COUNT ( CASE WHEN a.IsBad > 0 THEN 1 END ) AS isBad,COUNT ( CASE WHEN a.IsComplain > 0 THEN 1 END ) AS isComplain  FROM CE_ErpTradeCell o LEFT JOIN Ce_ErpTradeCellExtend e ON o.ctid = e.ctid LEFT JOIN CE_ErpShop s ON o.ShopId = s.id LEFT JOIN Ce_ErpTradeAfterSaleExtend a ON o.ctid = a.tid   WHERE 1=1 {0}  GROUP BY s.ShopName", sqlDate);
             DataTable dtafter = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
             int totalAfter = 0;
             DataTable dt = new DataTable();
@@ -2191,6 +2205,8 @@ namespace SiteCore.Handler
             dt.Columns.Add(new DataColumn("rate", typeof(string)));
             dt.Columns.Add(new DataColumn("rateProp", typeof(string)));
             dt.Columns.Add(new DataColumn("checkout", typeof(string)));
+            dt.Columns.Add(new DataColumn("isBad", typeof(string)));
+            dt.Columns.Add(new DataColumn("isComplain", typeof(string)));
             DataRow dr_he = dt.NewRow();
             dr_he[0] = "合计";
             dr_he[1] = 0;
@@ -2198,6 +2214,8 @@ namespace SiteCore.Handler
             dr_he[3] = 0;
             dr_he[4] = 100;
             dr_he[5] = 0;
+            dr_he[6] = 0;
+            dr_he[7] = 0;
             foreach (DataRow row in dtafter.Rows)
             {
                 DataRow dr = dt.NewRow();
@@ -2206,6 +2224,8 @@ namespace SiteCore.Handler
                 dr[2] = row["AllOrder"];
                 dr[4] = 0;
                 dr[5] = row["checkout"];
+                dr[6] = row["isBad"];
+                dr[7] = row["isComplain"];
                 decimal rate = 0;
                 if (dr[1].ToString() != "0")
                 {
@@ -2264,7 +2284,7 @@ namespace SiteCore.Handler
 
             }
 
-            sql.AppendFormat("SELECT p.PType AS goodsName, COUNT ( * ) AS AllOrder, COUNT ( CASE WHEN o.AfterSaleState >= 1 THEN 1 END ) AS aftersaleOrder  FROM CE_ErpTradeCell o LEFT JOIN CE_ErpProduct p ON o.ProductId = p.ID   WHERE 1=1 {0}  GROUP BY p.PType", sqlDate);
+            sql.AppendFormat("SELECT p.PType AS goodsName, COUNT ( * ) AS AllOrder, COUNT ( CASE WHEN o.AfterSaleState >= 1 THEN 1 END ) AS aftersaleOrder ,COUNT ( CASE WHEN a.IsBad > 0 THEN 1 END ) AS isBad,COUNT ( CASE WHEN a.IsComplain > 0 THEN 1 END ) AS isComplain  FROM CE_ErpTradeCell o LEFT JOIN CE_ErpProduct p ON o.ProductId = p.ID LEFT JOIN Ce_ErpTradeAfterSaleExtend a ON o.ctid = a.tid   WHERE 1=1 {0}  GROUP BY p.PType", sqlDate);
             DataTable dtafter = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
             int totalAfter = 0;
             DataTable dt = new DataTable();
@@ -2273,6 +2293,8 @@ namespace SiteCore.Handler
             dt.Columns.Add(new DataColumn("AllOrder", typeof(string)));
             dt.Columns.Add(new DataColumn("rate", typeof(string)));
             dt.Columns.Add(new DataColumn("rateProp", typeof(string)));
+            dt.Columns.Add(new DataColumn("isBad", typeof(string)));
+            dt.Columns.Add(new DataColumn("isComplain", typeof(string)));
             DataRow dr_he = dt.NewRow();
             dr_he[0] = "合计";
             dr_he[1] = 0;
@@ -2286,6 +2308,8 @@ namespace SiteCore.Handler
                 dr[1] = row["aftersaleOrder"];
                 dr[2] = row["AllOrder"];
                 dr[4] = 0;
+                dr[5] = row["isBad"];
+                dr[6] = row["isComplain"];
                 decimal rate = 0;
                 if (dr[1].ToString() != "0")
                 {
@@ -2342,7 +2366,7 @@ namespace SiteCore.Handler
 
             }
 
-            sql.AppendFormat("SELECT u.OrgName, COUNT ( * ) AS AllOrder, COUNT ( CASE WHEN o.AfterSaleState >= 1 THEN 1 END ) AS aftersaleOrder  FROM CE_ErpTradeCell o LEFT JOIN view_ErpUser u ON o.DesignUserId = u.ID  WHERE 1=1 {0}  GROUP BY u.OrgName", sqlDate);
+            sql.AppendFormat("SELECT u.OrgName,u.Name, COUNT ( * ) AS AllOrder, COUNT ( CASE WHEN o.AfterSaleState >= 1 THEN 1 END ) AS aftersaleOrder,COUNT ( CASE WHEN a.IsBad > 0 THEN 1 END ) AS isBad,COUNT ( CASE WHEN a.IsComplain > 0 THEN 1 END ) AS isComplain   FROM CE_ErpTradeCell o LEFT JOIN view_ErpUser u ON o.DesignUserId = u.ID LEFT JOIN Ce_ErpTradeAfterSaleExtend a ON o.ctid = a.tid  WHERE 1=1 {0}  GROUP BY u.OrgName,u.Name", sqlDate);
             DataTable dtafter = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
             int totalAfter = 0;
             DataTable dt = new DataTable();
@@ -2351,12 +2375,18 @@ namespace SiteCore.Handler
             dt.Columns.Add(new DataColumn("AllOrder", typeof(string)));
             dt.Columns.Add(new DataColumn("rate", typeof(string)));
             dt.Columns.Add(new DataColumn("rateProp", typeof(string)));
+            dt.Columns.Add(new DataColumn("Name", typeof(string)));
+            dt.Columns.Add(new DataColumn("isBad", typeof(string)));
+            dt.Columns.Add(new DataColumn("isComplain", typeof(string)));
             DataRow dr_he = dt.NewRow();
             dr_he[0] = "合计";
             dr_he[1] = 0;
             dr_he[2] = 0;
             dr_he[3] = 0;
             dr_he[4] = 100;
+            dr_he[5] = 0;
+            dr_he[6] = 0;
+            dr_he[7] = 0;
             foreach (DataRow row in dtafter.Rows)
             {
                 DataRow dr = dt.NewRow();
@@ -2364,6 +2394,9 @@ namespace SiteCore.Handler
                 dr[1] = row["aftersaleOrder"];
                 dr[2] = row["AllOrder"];
                 dr[4] = 0;
+                dr[5] = row["Name"];
+                dr[6] = row["isBad"];
+                dr[7] = row["isComplain"];
                 decimal rate = 0;
                 if (dr[1].ToString() != "0")
                 {
@@ -2422,7 +2455,7 @@ namespace SiteCore.Handler
 
             }
 
-            sql.AppendFormat("SELECT u.OrgName, COUNT ( * ) AS AllOrder, COUNT ( CASE WHEN o.AfterSaleState >= 1 THEN 1 END ) AS aftersaleOrder  FROM CE_ErpTradeCell o LEFT JOIN view_ErpUser u ON o.CustomerUserId = u.ID  WHERE 1=1 {0}  GROUP BY u.OrgName", sqlDate);
+            sql.AppendFormat("SELECT u.OrgName,u.Name, COUNT ( * ) AS AllOrder, COUNT ( CASE WHEN o.AfterSaleState >= 1 THEN 1 END ) AS aftersaleOrder ,COUNT ( CASE WHEN a.IsBad > 0 THEN 1 END ) AS isBad,COUNT ( CASE WHEN a.IsComplain > 0 THEN 1 END ) AS isComplain  FROM CE_ErpTradeCell o LEFT JOIN view_ErpUser u ON o.CustomerUserId = u.ID LEFT JOIN Ce_ErpTradeAfterSaleExtend a ON o.ctid = a.tid  WHERE 1=1 {0}  GROUP BY u.OrgName,u.Name", sqlDate);
             DataTable dtafter = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
             int totalAfter = 0;
             DataTable dt = new DataTable();
@@ -2431,12 +2464,18 @@ namespace SiteCore.Handler
             dt.Columns.Add(new DataColumn("AllOrder", typeof(string)));
             dt.Columns.Add(new DataColumn("rate", typeof(string)));
             dt.Columns.Add(new DataColumn("rateProp", typeof(string)));
+            dt.Columns.Add(new DataColumn("Name", typeof(string)));
+            dt.Columns.Add(new DataColumn("isBad", typeof(string)));
+            dt.Columns.Add(new DataColumn("isComplain", typeof(string)));
             DataRow dr_he = dt.NewRow();
             dr_he[0] = "合计";
             dr_he[1] = 0;
             dr_he[2] = 0;
             dr_he[3] = 0;
             dr_he[4] = 100;
+            dr_he[5] = 100;
+            dr_he[6] = 100;
+            dr_he[7] = 100;
             foreach (DataRow row in dtafter.Rows)
             {
                 DataRow dr = dt.NewRow();
@@ -2444,6 +2483,9 @@ namespace SiteCore.Handler
                 dr[1] = row["aftersaleOrder"];
                 dr[2] = row["AllOrder"];
                 dr[4] = 0;
+                dr[5] = row["Name"];
+                dr[6] = row["isBad"];
+                dr[7] = row["isComplain"];
                 decimal rate = 0;
                 if (dr[1].ToString() != "0")
                 {

SiteCore/Handler/sync.shop.cs

@@ -170,6 +170,7 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string key = GetPostString("key");
+            lw.Add(string.Format("isDel = 0"));
             if (key.Length > 0) lw.Add(string.Format("PType like '%{0}%' or PMaterial like '%{0}%'", key));
             dStruct.Order = "id asc";
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());
@@ -202,6 +203,7 @@ namespace SiteCore.Handler
                 entity.PNum = GetPostString("PNum");
                 entity.PMaterial = GetPostString("PMaterial");
                 entity.PCraft = GetPostString("PCraft");
+                entity.SizeUnit = GetPostString("sizeUnit");
                 entity.UpdateTime = DateTime.Now;
                 entity.UpdateUserName = CurrentUser.UserName;
                 entity.uuid = entity.PType;

Web/EArc/ProductManager.aspx

@@ -1,6 +1,6 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage/View.master" AutoEventWireup="true" CodeFile="ProductManager.aspx.cs" Inherits="EArc_ProductManager" %>
 
-<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
     <script type="text/javascript">
         var exData = null;
         var edit_id = "";
@@ -15,7 +15,7 @@
             var record = e.record;
             var id = record.ID;
             var tag = record.IsAutoDistribute;
-            var html = "<div style='color:" + (tag == 1 ? "green" : "")+";' onclick='autoChanged(" + id + ")'>" + (tag == 1 ? "已开启" : "已关闭") + "</div>";
+            var html = "<div style='color:" + (tag == 1 ? "green" : "") + ";' onclick='autoChanged(" + id + ")'>" + (tag == 1 ? "已开启" : "已关闭") + "</div>";
             return html;
         }
 
@@ -48,6 +48,7 @@
             $("#txtNum").val(rec.PNum);
             $("#txtMaterial").val(rec.PMaterial);
             $("#txtCraft").val(rec.PCraft);
+            $("#txtSizeUnit").val(rec.sizeUnit);
             mini.get("add_win").show();
         }
 
@@ -65,7 +66,7 @@
                 resultShow(data, "grid.reload();");
             });
         }
-        
+
         function saveFn() {
             var parms = new Object();
             parms.eid = edit_id;
@@ -77,6 +78,7 @@
             parms.PNum = $("#txtNum").val();
             parms.PMaterial = $("#txtMaterial").val();
             parms.PCraft = $("#txtCraft").val();
+            parms.sizeUnit = $("#txtSizeUnit").val();
 
             postAjax("save_erp_product", parms, function (data) {
                 mini.get("add_win").hide();
@@ -91,7 +93,7 @@
             });
         }
 
-       
+
         function cancelFn() {
             mini.get("add_win").hide();
         }
@@ -104,7 +106,7 @@
             var html = "";
             html += getGridBtn("edit", "修改", "editFn('" + id + "')");
             html += getGridBtn("stop", "删除", "delFn('" + id + "')");
-html += getGridBtn("memo", "表单", "addnewFn('" + id + "')");
+            html += getGridBtn("memo", "表单", "addnewFn('" + id + "')");
             return html;
         }
 
@@ -113,7 +115,7 @@ html += getGridBtn("memo", "表单", "addnewFn('" + id + "')");
         }
 
         $(function () {
-            
+
         });
 
         function view_search() {
@@ -140,67 +142,110 @@ html += getGridBtn("memo", "表单", "addnewFn('" + id + "')");
         }
     </script>
     <style type="text/css">
-        .win_tb{width:96%;margin-left:auto;margin-right:auto;margin-top:10px;background-color:#dedede;}
-        .win_tb td{height:36px;background-color:#fff;font-size:14px;padding:5px;}
-        .win_tb input[type=text]{width:90%;height:24px;font-size:14px;}
-        .win_tb input[type=checkbox]{width:18px;height:18px;}
-        .win_tb select{font-size:14px;height:30px;padding: 0px 5px;}
-        .win_tb .td1{color:#666;background-color:#F8F8F8;text-align:center;}
-        .win_tb .td2{}
+        .win_tb {
+            width: 96%;
+            margin-left: auto;
+            margin-right: auto;
+            margin-top: 10px;
+            background-color: #dedede;
+        }
+
+            .win_tb td {
+                height: 36px;
+                background-color: #fff;
+                font-size: 14px;
+                padding: 5px;
+            }
+
+            .win_tb input[type=text] {
+                width: 90%;
+                height: 24px;
+                font-size: 14px;
+            }
+
+            .win_tb input[type=checkbox] {
+                width: 18px;
+                height: 18px;
+            }
+
+            .win_tb select {
+                font-size: 14px;
+                height: 30px;
+                padding: 0px 5px;
+            }
+
+            .win_tb .td1 {
+                color: #666;
+                background-color: #F8F8F8;
+                text-align: center;
+            }
+
+            .win_tb .td2 {
+            }
         /*.win_tb input{height:20px;}
     .win_tb .td1{height:35px;width:120px;font-size:12px;text-align:center;}
     .win_tb .td2{height:35px;width:280px;font-size:12pt;padding-left:5px;text-align:left;}*/
     </style>
 </asp:Content>
-<asp:Content ID="Content2" ContentPlaceHolderID="btn" Runat="Server">
+<asp:Content ID="Content2" ContentPlaceHolderID="btn" runat="Server">
 </asp:Content>
-<asp:Content ID="Content3" ContentPlaceHolderID="toolbar" Runat="Server">
-
+<asp:Content ID="Content3" ContentPlaceHolderID="toolbar" runat="Server">
 </asp:Content>
-<asp:Content ID="Content4" ContentPlaceHolderID="content" Runat="Server">
+<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_product"  >
+        <div id="m_grid" class="mini-datagrid" style="width: 100%; height: 100%;" showemptytext="true" emptytext="暂无记录" url="../handler/sync.ashx?t=get_erp_product">
             <div property="columns">
-<%--                <div field="Sort" width="50" align="center" headerAlign="center">排序</div>--%>
-<%--                <div field="ComName" width="120" align="center" headerAlign="center">公司名称</div>--%>
+                <%--                <div field="Sort" width="50" align="center" headerAlign="center">排序</div>--%>
+                <%--                <div field="ComName" width="120" align="center" headerAlign="center">公司名称</div>--%>
                 <div type="indexcolumn" width="20"></div>
 
-                <div field="PType" width="100" align="center" headerAlign="center">产品类型</div>
-                <div field="uuid" width="100" align="center" headerAlign="center">产品标识</div>
-                <div field="PNum" renderer="conFn" width="180" align="center" headerAlign="center">数量</div>
-                <div field="PMaterial" width="180" align="center" headerAlign="center">材质</div>
-                <div field="PCraft" width="150" align="center" headerAlign="center">工艺</div>
-                <div name="auto" width="60" headerAlign="center" align="center" renderer="autoRenderer">自动指派供应商</div>
-                <div name="write" width="60" headerAlign="center" align="center" renderer="writeRenderer">填设计费</div>
-                <div name="write" width="60" headerAlign="center" align="center" renderer="selectRenderer">全选内部设计</div>
-                <div name="action" width="120" headerAlign="center" align="center" renderer="actionRenderer" cellStyle="padding:0;">#</div>
+                <div field="PType" width="100" align="center" headeralign="center">产品类型</div>
+                <div field="uuid" width="100" align="center" headeralign="center">产品标识</div>
+                <div field="PNum" renderer="conFn" width="180" align="center" headeralign="center">数量</div>
+                <div field="PMaterial" width="180" align="center" headeralign="center">材质</div>
+                <div field="PCraft" width="150" align="center" headeralign="center">工艺</div>
+                <div field="sizeUnit" width="60" align="center" headeralign="center">单位</div>
+                <div name="auto" width="60" headeralign="center" align="center" renderer="autoRenderer">自动指派供应商</div>
+                <div name="write" width="60" headeralign="center" align="center" renderer="writeRenderer">填设计费</div>
+                <div name="write" width="60" headeralign="center" align="center" renderer="selectRenderer">全选内部设计</div>
+                <div name="action" width="120" headeralign="center" align="center" renderer="actionRenderer" cellstyle="padding:0;">#</div>
             </div>
         </div>
     </div>
 
-    <div id="add_win" class="mini-window" title="店铺信息" style="width:750px;height:400px;position:relative;display:none">
+    <div id="add_win" class="mini-window" title="店铺信息" style="width: 750px; height: 400px; position: relative; display: none">
         <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
             <tr>
                 <td class="td1">产品类型</td>
-                <td class="td2" colspan="3"><textarea id="txtType" style="width:96%;height:60px;"></textarea></td>
+                <td class="td2" colspan="3">
+                    <textarea id="txtType" style="width: 96%; height: 60px;"></textarea></td>
             </tr>
             <tr>
                 <td class="td1">产品数量</td>
-                <td class="td2" colspan="3"><textarea id="txtNum" style="width:96%;height:60px;"></textarea></td>
+                <td class="td2" colspan="3">
+                    <textarea id="txtNum" style="width: 96%; height: 60px;"></textarea></td>
             </tr>
             <tr>
                 <td class="td1">产品材质</td>
-                <td class="td2" colspan="3"><textarea id="txtMaterial" style="width:96%;height:60px;"></textarea></td>
+                <td class="td2" colspan="3">
+                    <textarea id="txtMaterial" style="width: 96%; height: 60px;"></textarea></td>
             </tr>
             <tr>
                 <td class="td1">产品工艺</td>
-                <td class="td2" colspan="3"><textarea id="txtCraft" style="width:96%;height:60px;"></textarea></td>
+                <td class="td2" colspan="3">
+                    <textarea id="txtCraft" style="width: 96%; height: 60px;"></textarea></td>
+            </tr>
+            <tr>
+                <td class="td1">产品尺寸单位</td>
+                <td class="td2" colspan="3">
+                    <textarea id="txtSizeUnit" style="width: 96%; height: 50px;"></textarea>
+                </td>
             </tr>
             <tr>
                 <td colspan="4">
-                    <div class="win_btn" style="text-align:center;">
-                        <a class="mini-button"  iconCls="icon-ok" onclick="saveFn">保存</a>&nbsp;
-                        <a class="mini-button"  iconCls="icon-cancel" onclick="cancelFn">取消</a>
+                    <div class="win_btn" style="text-align: center;">
+                        <a class="mini-button" iconcls="icon-ok" onclick="saveFn">保存</a>&nbsp;
+                        <a class="mini-button" iconcls="icon-cancel" onclick="cancelFn">取消</a>
                     </div>
                 </td>
             </tr>

Web/ECharts/AfterSaleGather.aspx

@@ -336,6 +336,8 @@
                                 <div field="rate" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后率</div>
                                 <div field="rateProp" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后占比</div>
                                 <div field="checkout" datatype="int" width="60" align="center" headeralign="center" allowsort="true">查货超时</div>
+                                <div field="isBad" datatype="int" width="60" align="center" headeralign="center" allowsort="true">差评</div>
+                                <div field="isComplain" datatype="int" width="60" align="center" headeralign="center" allowsort="true">投诉</div>
                             </div>
                         </div>
                     </div>
@@ -348,6 +350,8 @@
                                 <div field="aftersaleOrder" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后数量</div>
                                 <div field="rate" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后率</div>
                                 <div field="rateProp" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后占比</div>
+                                <div field="isBad" datatype="int" width="60" align="center" headeralign="center" allowsort="true">差评</div>
+                                <div field="isComplain" datatype="int" width="60" align="center" headeralign="center" allowsort="true">投诉</div>
                             </div>
                         </div>
                     </div>
@@ -377,6 +381,8 @@
                                 <div field="PreTimeOut" datatype="int" width="60" align="center" headeralign="center" allowsort="true">未处理超时</div>
                                 <div field="ReprintOut" datatype="int" width="60" align="center" headeralign="center" allowsort="true">跟单超时</div>
                                 <div field="BackRate" datatype="int" width="60" align="center" headeralign="center" allowsort="true">打回率</div>
+                                <div field="isBad" datatype="int" width="60" align="center" headeralign="center" allowsort="true">差评</div>
+                                <div field="isComplain" datatype="int" width="60" align="center" headeralign="center" allowsort="true">投诉</div>
                             </div>
                         </div>
 
@@ -388,10 +394,13 @@
                             emptytext="暂无记录" url="../handler/sync.ashx?t=get_erp_aftersale_org_design_gather">
                             <div property="columns">
                                 <div field="OrgName" width="60" align="center" headeralign="center">部门名称</div>
+                                <div field="Name" width="60" align="center" headeralign="center">名称</div>
                                 <div field="AllOrder" datatype="int" width="60" align="center" headeralign="center" allowsort="true">成交单量</div>
                                 <div field="aftersaleOrder" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后数量</div>
                                 <div field="rate" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后率</div>
                                 <div field="rateProp" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后占比</div>
+                                <div field="isBad" datatype="int" width="60" align="center" headeralign="center" allowsort="true">差评</div>
+                                <div field="isComplain" datatype="int" width="60" align="center" headeralign="center" allowsort="true">投诉</div>
                             </div>
                         </div>
                     </div>
@@ -400,10 +409,13 @@
                             emptytext="暂无记录" url="../handler/sync.ashx?t=get_erp_aftersale_org_custom_gather">
                             <div property="columns">
                                 <div field="OrgName" width="60" align="center" headeralign="center">部门名称</div>
+                                <div field="Name" width="60" align="center" headeralign="center">名称</div>
                                 <div field="AllOrder" datatype="int" width="60" align="center" headeralign="center" allowsort="true">成交单量</div>
                                 <div field="aftersaleOrder" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后数量</div>
                                 <div field="rate" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后率</div>
                                 <div field="rateProp" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后占比</div>
+                                <div field="isBad" datatype="int" width="60" align="center" headeralign="center" allowsort="true">差评</div>
+                                <div field="isComplain" datatype="int" width="60" align="center" headeralign="center" allowsort="true">投诉</div>
                             </div>
                         </div>
                     </div>
@@ -419,6 +431,8 @@
                                 <div field="AfterSaleReason3" name="AfterSaleReason3" datatype="int" width="60" align="center" headeralign="center" allowsort="true">三级原因</div>
                                 <div field="total" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后数量</div>
                                 <div field="rate" datatype="int" width="60" align="center" headeralign="center" allowsort="true">售后占比</div>
+                                <div field="isBad" datatype="int" width="60" align="center" headeralign="center" allowsort="true">差评</div>
+                                <div field="isComplain" datatype="int" width="60" align="center" headeralign="center" allowsort="true">投诉</div>
                             </div>
                         </div>
                     </div>