edit

BizCom/Dao/CeErpTradeCellExtend.cs

@@ -422,6 +422,17 @@ namespace BizCom
             get { return _parentOrderSn; }
             set { _parentOrderSn = value; }
         }
+
+        private string _refundMemo = "";
+        /// <summary>
+        /// 退款备注
+        /// </summary>
+        [Property]
+        public string RefundMemo
+        {
+            get { return _refundMemo; }
+            set { _refundMemo = value; }
+        }
         public static CeErpTradeCellExtend getByTid(string ctid)
         {
             return FindFirst(Expression.Sql(string.Format("ctid='{0}'", ctid)));

SiteCore/Handler/sync.order.cs

@@ -147,6 +147,15 @@ namespace SiteCore.Handler
             string uploaddate2 = GetPostString("uploaddate2");
             string update = GetDateMinuteWhere("FinishDesignTime", uploaddate1, uploaddate2);
             if (update.Length > 0) lw.Add(update);
+
+            string deliverydate1 = GetPostString("deliverydate1");
+            string deliverydate2 = GetPostString("deliverydate2");
+            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));
+            };
+
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
 
@@ -4603,6 +4612,7 @@ namespace SiteCore.Handler
                         entity.OrderState = 7;//发货后订单已发货
                         entity.OutSid = outSid;
                         entity.MemoOpt = 0;
+                        entity.FinishDeliveryTime = DateTime.Now;
                         entity.Update();
                         commonHelper.aftersaleSend(entity.ctid, comName, outSid);
                         commonHelper.UpdateRelationOrder(entity.ctid);
@@ -7836,6 +7846,86 @@ namespace SiteCore.Handler
             writeGridDataTableJson(dStruct.TotalCount, dt);
         }
 
+        public void get_erp_refunddesignlist()
+        {
+            DataStruct dStruct = GetPostStruct();
+            List<string> lw = new List<string>();
+            string tid = GetPostString("tid");
+            if (tid.Length > 0) lw.Add(string.Format("tid like '%{0}%'", tid));
+
+            string shopname = GetPostString("shopname");
+            if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
+            string buyernick = GetPostString("buyer_nick");
+            if (buyernick.Length > 0) lw.Add(string.Format("buyer_nick like '%{0}%'", buyernick));
+            string customer = GetPostString("customer");
+            if (customer.Length > 0) lw.Add(string.Format("CustomerTb like '%{0}%'", customer));
+            string design = GetPostString("design");
+            if (design.Length > 0) lw.Add(string.Format("DesignUserName like '%{0}%'", design));
+            string sellermemo = GetPostString("seller_memo");
+            if (sellermemo.Length > 0) lw.Add(string.Format("seller_memo like '%{0}%'", sellermemo));
+
+            string redate1 = GetPostString("refunddate1");
+            string redate2 = GetPostString("refunddate2");
+            string dwdate = GetDateMinuteWhere("created", redate1, redate2);
+            if (dwdate.Length > 0) lw.Add(dwdate);
+
+            string price1 = GetPostString("price1");
+            if (price1.Length > 0) lw.Add(string.Format("payment >= '{0}'", price1));
+            string price2 = GetPostString("price2");
+            if (price2.Length > 0) lw.Add(string.Format("payment <= '{0}'", price2));
+            string ispartrefund = GetPostString("ispartrefund");
+            if (ispartrefund.Length > 0) lw.Add(string.Format("IsPartRefund={0}", ispartrefund));
+
+            int myOrgid = CurrentUser.UserPost.OrgID;
+            string myOrgCode = CurrentUser.UserPost.Post.Code;
+            if ("Designer".Equals(myOrgCode))//设计师能看到的
+            {
+                if (CurrentUser.User.TeamIds.Length > 0)
+                {
+                    lw.Add(string.Format(" DesignUserId in ({1})", CurrentUser.UserID, CurrentUser.User.TeamIds));
+                }
+                else
+                {
+                    lw.Add(string.Format("DesignUserId = {0} ", CurrentUser.UserID));
+                }
+            }
+            else if ("SysAdmin".Equals(myOrgCode))
+            {
+            }
+            else
+            {
+                if (CurrentUser.User.ManageOrgIds.Length > 0)
+                {
+                    lw.Add(string.Format("DesOrgID in ({0})", CurrentUser.User.ManageOrgIds));
+                }
+                else
+                {
+                    lw.Add(string.Format("DesOrgID = {0}", myOrgid));
+                }
+            }
+
+            lw.Add("OrderState > 2 and OrderState < 6");
+            dStruct.Order = "created desc";
+
+            dStruct.MainWhere = string.Join(" and ", lw.ToArray());
+            DataTable dt = WebCache.GetData("view_ErpTradeCellRefund", dStruct);
+            dt.Columns.Add("refund_fees");
+            foreach (DataRow dr in dt.Rows)
+            {
+                String status = dr["status"].ToString();
+                if (status.Equals("SUCCESS") || status.Equals("REFUNDED"))
+                {
+                    dr["refund_fees"] = dr["refund_fee"];
+                }
+                else
+                {
+                    dr["refund_fees"] = "0.0";
+                }
+
+            }
+            writeGridDataTableJson(dStruct.TotalCount, dt);
+        }
+
 
         public void handle_erp_refundtag()
         {
@@ -7880,6 +7970,32 @@ namespace SiteCore.Handler
                 returnErrorMsg("找不到订单记录");
             }
         }
+        public void handle_erp_designrefundtag()
+        {
+            if (UrlPostParmsCheck("refund_id"))
+            {
+                string eid = GetPostString("refund_id");
+                CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(eid);
+                if (ceErpTradeCellExtend == null)
+                {
+                    ceErpTradeCellExtend = new CeErpTradeCellExtend();
+                    ceErpTradeCellExtend.ctid = eid;
+                }
+                ceErpTradeCellExtend.RefundMemo = GetPostString("Memo");
+                if (ceErpTradeCellExtend.ID > 0)
+                {
+                    ceErpTradeCellExtend.Update();
+                }
+                else
+                {
+                    ceErpTradeCellExtend.Create();
+                }
+                LogHelper.addLog(ceErpTradeCellExtend.ctid, CurrentUser.UserID, "退款标记：" + ceErpTradeCellExtend.RefundMemo);
+                returnSuccessMsg("操作成功！");
+                return;
+            }
+            returnErrorMsg("找不到订单记录");
+        }
 
 
         public void upd_erp_refundverify()

SiteCore/taobao/tmcHelper.cs

@@ -390,7 +390,7 @@ namespace SiteCore
 
         static List<string> postcodes = new List<string>()
         {
-           "yujia","taolai"
+           "yujia","taolai","zhufan","dingyi","lingtao"
         };
 
         public static void Api_TmcTradeMsg(string res)

Web/EDesign/MyReDesign.aspx

@@ -0,0 +1,151 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage/ErpView.master" AutoEventWireup="true" CodeFile="MyReDesign.aspx.cs" Inherits="EDesign_MyReDesign" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
+    <script type="text/javascript" src="../js/address.js"></script>
+    <script type="text/javascript" src="js/myReDesign.js?v=<%=SiteVer %>"></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 {
+            }
+
+        .marginleft20 {
+            margin-left: 20px;
+        }
+
+        .word_tui {
+            border-radius: 50%;
+            background-color: red;
+            color: white;
+            font-size: 14px;
+            text-align: center;
+            padding: 3px;
+            margin-left: 5px;
+        }
+
+        .word_shou {
+            background-color: saddlebrown;
+        }
+
+        .word_green {
+            background-color: forestgreen;
+        }
+
+        .mini-grid-cell-nowrap {
+            overflow: hidden;
+            /* white-space: nowrap;
+            text-overflow: ellipsis; */
+            word-break: keep-all;
+            word-wrap: break-word;
+            white-space: normal;
+        }
+        /*.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">
+    <a id="btnExport" runat="server" visible="false" class="mini-button mini-button-success new_use_btn_green" iconcls="icon-folder" onclick="exportFn()">导出</a>
+</asp:Content>
+<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" contextmenu="#gridMenu" emptytext="暂无记录" url="../handler/sync.ashx?t=get_erp_refunddesignlist">
+            <div property="columns">
+                <div type="checkcolumn" width="20"></div>
+                <div field="tid" width="110" align="center" headeralign="center" renderer="orderIdRenderer">订单编号</div>
+                <div field="pay_time" width="80" align="center" headeralign="center" renderer="orderPTimeRenderer">付款时间</div>
+                <div field="payment" width="40" align="center" headeralign="center">订单金额</div>
+                <div field="refund_fee" width="50" align="center" headeralign="center" renderer="refundRenderer">退款金额</div>
+                <div field="IsPartRefund" width="30" align="center" headeralign="center" renderer="partRenderer">是否部分退款</div>
+                <div field="seller_memo" width="100" align="center" headeralign="center">文件名</div>
+                <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="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>
+            </div>
+        </div>
+    </div>
+    <ul id="gridMenu" class="mini-contextmenu" onbeforeopen="onBeforeOpen">
+        <li name="edit" iconcls="icon-copy" onclick="onCopyOrder">复制单号</li>
+        <li name="edit" iconcls="icon-copy" onclick="onCopyBuyerNick">复制旺旺号</li>
+    </ul>
+
+    <div id="handle_win" class="mini-window" title="标记" style="width: 780px; height: 400px; position: relative; display: none">
+
+        <fieldset style="border: solid 1px #aaa; padding: 3px; margin: 5px;">
+            <legend style="font-size: 16px; font-weight: bold;">订单信息</legend>
+            <div style="padding: 3px;">
+                <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
+                    <tr>
+                        <td class="td1">订单编号</td>
+                        <td class="td2" colspan="3">
+                            <div id="txtTid" style="display: flex; flex-direction: row;"></div>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </fieldset>
+
+        <fieldset style="border: solid 1px #aaa; padding: 3px; margin: 5px;">
+            <legend style="font-size: 16px; font-weight: bold;">责任方标记</legend>
+            <div style="padding: 3px;">
+                <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
+                    <tr>
+                        <td class="td1">标记备注</td>
+                        <td class="td2" colspan="5">
+                            <textarea id="txtAfterMemo" style="width: 96%; height: 60px;"></textarea></td>
+                    </tr>
+                    <tr>
+                        <td colspan="6">
+                            <div class="win_btn" style="text-align: center;">
+                                <a class="mini-button" iconcls="icon-ok" onclick="saveHandleFn">保存</a>&nbsp;
+                                <a class="mini-button" iconcls="icon-cancel" onclick="cancelHandleFn">取消</a>
+                            </div>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </fieldset>
+
+    </div>
+
+</asp:Content>
+

Web/EDesign/MyReDesign.aspx.cs

@@ -0,0 +1,55 @@
+using SiteCore;
+using SQLData;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using Utils.Serialization;
+
+public partial class EDesign_MyReDesign : BasePage
+{
+    protected override void OnPreInit(EventArgs e)
+    {
+        _repTitle = "退款列表";
+        PmTag = "myReDesign";
+        //_selfCheckPermission = true;
+        _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)
+    {
+        if (!IsPostBack)
+        {
+            if (_permissions.Contains("export"))
+            {
+                btnExport.Visible = true;
+            }
+            else
+            {
+                btnExport.Visible = false;
+            }
+            string sData = GetString("sData");
+            if (sData != "") AppendScript("openPageData=" + sData + ";");
+            //StringBuilder sql = new StringBuilder();
+            //sql.AppendFormat("select * from s_runinfotype");
+            //DataSet ds = DbHelper.DbConn.ExecuteDataset(sql.ToString());
+            //DataTable dt = ds.Tables[0];
+            //AppendScript("tData=" + JsonString.DataTable2Json(dt) + ";");
+
+            //selType.DataSource = dt;
+            //selType.DataValueField = "ID";
+            //selType.DataTextField = "Name";
+            //selType.DataBind();
+        }
+        //foreach (DataRow dr in dt.Rows)
+        //{
+        //}
+    }
+}

Web/EDesign/js/myReDesign.js

@@ -0,0 +1,276 @@
+var exData = null;
+var edit_id = "";
+var _memo_msg = "";
+function addFn() {
+    edit_id = "";
+    $(".win_tb").find("input").val("");
+    $(".win_tb").find("textarea").val("");
+    mini.get("add_win").show();
+}
+
+
+function orderPTimeRenderer(e) {
+    var record = e.record;
+    var rowIndex = e.rowIndex;
+    var html = "<div style=\"display:flex;flex-direction:column;\">";
+    html += ("<div style=\"color:#666;\">" + record.seller_nick + "</div>");
+    html += getWWurlByNick(record.buyer_nick);
+    html += ("<div style=\"color:#666;\">" + formatCommonDate(record.pay_time) + "</div>");
+    //console.log(record);
+    if (!!record.UrgencyTime && record.UrgencyTime != "") {
+        html += ("<div style=\"color:red;\">急:" + formatCommonDate(record.UrgencyTime) + "</div>");
+    }
+    html += "</div>";
+    return html;
+}
+function reasonRenderer(e) {
+    var grid = e.sender;
+    var record = e.record;
+    var html = "";
+    html += ("<div style='color:#E3940B;'>" + record.reason + "</div>");
+    return html;
+}
+
+function refundRenderer(e) {
+    var grid = e.sender;
+    var record = e.record;
+    var html = "";
+    html += ("<div style='color:#B20505;'>" + record.refund_fee + "</div>");
+    return html;
+}
+function orderStatusRenderer(e) {
+    var grid = e.sender;
+    var record = e.record;
+    var statestr = getOrderStatestrByState(record.OrderState);
+    var taostatus = getInitStatusstrByState(record.status);
+    var html = "<div style=\"display:flex;flex-direction:column;\">";
+    html += ("<div onclick=\"clickToLog('" + record.ctid + "')\" style=\"color:" + (record.OrderState == 0 ? "red" : "blue") + ";margin-bottom:10px;\">" + statestr + "</div>");
+    html += ("<div>" + taostatus + "</div>");
+    html += "</div>";
+    return html;
+}
+
+function orderReStatusRenderer(e) {
+    var grid = e.sender;
+    var record = e.record;
+    var tid = record.tid;
+    var html = "<div style=\"display:flex;flex-direction:column;\">";
+    var str_status = getRefundStatusstrByState(record.restatus);
+    html += ("<div>" + str_status + "</div>");
+    html += "</div>";
+    return html;
+}
+
+function goodStatusRenderer(e) {
+    var grid = e.sender;
+    var record = e.record;
+    var tid = record.tid;
+    var rowIndex = e.rowIndex;
+    var statestr = getOrderStatestrByState(record.OrderState);
+    var html = "";
+    html += ("<div>" + getGoodStatus(record.good_status) + "</div>");
+    return html;
+}
+
+function getGoodStatus(st) {
+    if (st == "BUYER_NOT_RECEIVED") {
+        return "买家未收到货";
+    }
+    else if (st == "BUYER_RECEIVED") {
+        return "买家已收到货";
+    }
+    else if (st == "BUYER_RETURNED_GOODS") {
+        return "买家已退货";
+    }
+    return "";
+}
+
+function desRenderer(e) {
+    var grid = e.sender;
+    var record = e.record;
+    var html = "";
+    html += ("<div style='color:#E3940B;'>" + record.describe + "</div>");
+    return html;
+}
+function partRenderer(e) {
+    var record = e.record;
+    var html = "";
+    if (record.IsPartRefund == 1) {
+        html += ("<div style='color:blue;'>部分</div>");
+    }
+  
+    return html;
+}
+
+
+function payRenderer(e) {
+    var grid = e.sender;
+    var record = e.record;
+    var tid = record.tid;
+    var rowIndex = e.rowIndex;
+    var statestr = getOrderStatestrByState(record.OrderState);
+    var html = "<div style=\"display:flex;flex-direction:column;\">";
+    html += ("<div>订单：" + record.payment + "</div>");
+    html += ("<div>扣款：" + record.DeductFee + "</div>");
+    html += ("<div>退款：" + record.RefundFee + "</div>");
+    html += "</div>";
+    return html;
+}
+
+function orderCusRenderer(e) {
+    var grid = e.sender;
+    var record = e.record;
+    var tid = record.tid;
+    var rowIndex = e.rowIndex;
+    var html = getDDurlByPhone(record.CustomerMobile, record.CustomerTb);
+    return html;
+}
+function designRenderer(e) {
+    var grid = e.sender;
+    var record = e.record;
+    var tid = record.tid;
+    var rowIndex = e.rowIndex;
+    var html = getDDurlByPhone(record.DesignMobile, record.DesignUserName);
+    return html;
+}
+
+function createTimeRenderer(e) {
+    var grid = e.sender;
+    var record = e.record;
+    var tid = record.tid;
+    var rowIndex = e.rowIndex;
+    var html = ""
+    html += ("<div>" + formatCommonDate(record.created) + "</div>");
+    return html;
+}
+function actionRenderer(e) {
+    var record = e.record;
+    var id = record.tid;
+    var refundid = record.ctid;
+    var html = "";
+    html += getGridBtn("edit", "标记", "setTagFn('" + refundid + "')");
+    //html += getGridBtn("edit", "审核", "verifyFn('" + refundid + "')");
+
+    return html;
+}
+
+//处理按钮=弹窗
+function setTagFn(eid) {
+    edit_id = eid;
+    var rec = grid.getSelected();
+    mini.get("handle_win").show();
+    $("#handle_win").find("input").val("");
+    $("#handle_win").find("textarea").val("");
+
+    var ohtml = ("<div>" + rec.tid + "</div>" + "<div class='marginleft20'>" + rec.seller_nick + "</div>" + "<div class='marginleft20'>¥" + rec.total_fee + "</div>");
+    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() {
+    mini.get("handle_win").hide();
+}
+
+function saveHandleFn() {
+    var parms = new Object();
+    parms.refund_id = edit_id;
+    parms.Memo = $("#txtAfterMemo").val();
+    postAjax("handle_erp_designrefundtag", parms, function (data) {
+        mini.get("handle_win").hide();
+        resultShow(data, "grid.reload();");
+    });
+}
+
+//省份变动
+function changeProvinceFn(e) {
+    var rec = e.selected;
+    var v = e.value;
+    var cityData = getSiteAddress(v);
+    mini.get("#txtAddCity").setData(cityData);
+    mini.get("#txtAddCounty").setData([]);
+}
+//市区变动
+function changeCityFn(e) {
+    var rec = e.selected;
+    var v = e.value;
+    var countyData = getSiteAddress(v);
+    mini.get("#txtAddCounty").setData(countyData);
+}
+//根据id获取联动地区
+function getSiteAddress(pID) {
+    var newlist = [];
+    site_address.forEach(function (aa, bb) {
+        if (aa.TopID == pID) {
+            newlist.push(aa)
+        }
+    })
+    return newlist;
+}
+
+
+
+
+//查询按钮
+function searchFn() {
+    var form = new mini.Form("#ctl00_f_all");
+    var data = form.getData(true, false);
+    var s = data;
+    //var s = mini.encode(data);
+    //alert(s);
+    //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,
+        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
+    });
+}
+//清除查询内容
+function clearFn() {
+    //$("#ctl00_f_all").find("input").val("");
+    var form = new mini.Form("#ctl00_f_all");
+    form.clear();
+}
+
+
+
+function newPageSearchFn() {
+    var form = new mini.Form("#ctl00_f_all");
+    var data = form.getData(true, false);
+    var s = data;
+    var sData = JSON.stringify(data);
+    var sendData = "sData=" + sData;
+    if (parent != null) parent.openNewSearchTab("退款审核", "ERefund/RefundVerify.aspx", sendData);
+}
+
+$(function () {
+    if (openPageData != "") {
+        var s = openPageData;
+        grid.load({
+            ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state,
+            date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, seller_memo: s.memo
+        });
+        var form = new mini.Form("#ctl00_f_all");
+        if (form != undefined && form != null) {
+            form.setData(s);
+        }
+        //$("#ic_chkNewPageSearch")[0].checked = true;
+    }
+
+});
+
+function view_search() {
+    var key = "";
+    if ($("#txtKey").length > 0) {
+        key = $("#txtKey").val();
+    }
+
+    grid.load({ key: key, type: $("#txtSearchType").val() });
+}
+
+function onCopyOrder(e) {
+    var rec = grid.getSelected();
+    //rec.ctid
+    copyTextPlus(rec.tid);
+}

Web/EOrder/OrderList.aspx.cs

@@ -8,7 +8,7 @@ public partial class EOrder_OrderList : BasePage
         _repTitle = "订单列表";
         PmTag = "orderlist";
         //_selfCheckPermission = true;
-        _filterItem = "order,shop,wang,fukuan,moeny,memo,cus,des,state,oldcus,assign_time,addwechat,upload_time,finish_time,backreason,isNewSearch,overtime";
+        _filterItem = "order,shop,wang,fukuan,moeny,memo,cus,des,state,oldcus,assign_time,addwechat,upload_time,finish_time,backreason,isNewSearch,overtime,delivery_time";
         _keyFilterVisible = false;
         _addVisible = false;
     }

Web/EOrder/js/p_order.js

@@ -173,7 +173,7 @@ function searchFn() {
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, customer: s.customer, design: s.design, orderState: s.state, addwechat: s.addwechat,
         date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, seller_memo: s.memo, isoldcus: s.isoldcus, apdate1: s.assigndate1, apdate2: s.assigndate2
         , uploaddate1: s.uploaddate1, uploaddate2: s.uploaddate2, finishdate1: s.finishdate1, finishdate2: s.finishdate2, urgent: urgent, back: back, offlineSearch: offlineSearch, backReason: s.backreason, isNew: isNewSearch,
-        overtime: s.overtime
+        overtime: s.overtime, deliverydate1: s.deliverydate1, deliverydate2: s.deliverydate2
     }
     grid.load(parmsObj);
 

ecomServer/MainForm.cs

@@ -1066,10 +1066,10 @@ namespace ErpServer
 
         }
         bool isDataSync = false;
-
+        //598766 瑜伽 598825 涛莱 598782 竹范 598810 鼎怡 600090 领淘文具
         List<string> shopIds = new List<string>()
         {
-            "598766","598825"
+            "598766","598825","598782","598810", "600090"
         };
 
         public void syncDataSendOrder()