Jelajahi Sumber

新增申请打回

zhuyiyi 6 hari lalu
induk
melakukan
daac14a407

File diff ditekan karena terlalu besar
+ 0 - 1
SiteCore/Handler/sync.order.cs


+ 8 - 1
SiteCore/taobao/commonHelper.cs

@@ -2316,7 +2316,10 @@ namespace SiteCore
                 string response1 = HttpPost("http://www.kiy.cn/m-mobile/autobaojia/ApplyOrderRefund", jsonObject12.ToString());
                 JObject jsonObjects1 = JObject.Parse(response1);
                 string msg = (string)jsonObjects1["msg"];
-                msg = msg.Substring(0, 200);
+                if (msg.Length > 200)
+                {
+                    msg = msg.Substring(0, 200);
+                }
                 LogHelper.addLog(entity.ctid, 0, "CYT售后单推送:" + msg);
             }
             catch (Exception ex)
@@ -2899,6 +2902,10 @@ namespace SiteCore
         }
         public static void setSpuData(CeErpTrade father)
         {
+            if (string.IsNullOrEmpty(father.seller_memo))
+            {
+                return;
+            }
             string orderSql = string.Format("SELECT * FROM [dbo].[CE_ErpTradeOrder] WHERE tid = '{0}' and total_fee > 0", father.tid);
             DataTable table = SqlHelper.ExecuteDataSet(orderSql).Tables[0];
             string spu_id = "";

+ 299 - 0
Web/EDelivery/ApplyBack.aspx

@@ -0,0 +1,299 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage/ErpView.master" AutoEventWireup="true" CodeFile="ApplyBack.aspx.cs" Inherits="EDelivery_ApplyBack" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
+    <script type="text/javascript">
+        _page_size = 30;
+    </script>
+</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%;" allowunselect="true" showemptytext="true" contextmenu="#gridMenu" emptytext="暂无记录" url="../handler/sync.ashx?t=get_erp_applybackorderlist">
+            <div property="columns">
+                <div field="ctid" width="110" align="center" headeralign="center" renderer="orderIdRenderer">订单编号</div>
+                <div field="pay_time" width="80" align="center" headeralign="center" renderer="orderPTimeRenderer">付款时间</div>
+                <div field="SupplierName" width="60" 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="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 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="returnreason_win" class="mini-window" title="退单" style="width: 700px; height: 400px; position: relative; display: none">
+        <input type="hidden" id="returnreason_id" />
+        <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
+            <tr id="selectTar">
+                <td class="td1">打回目标</td>
+                <td class="td2" colspan="3">
+                    <select>
+                        <option value="2">设计</option>
+                        <option value="1">客服</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td class="td1"></td>
+                <td class="td2" colspan="3">
+                    <input id="selectReturnreason" class="mini-combobox" style="width: 80%;" textfield="title" valuefield="title" required="true" allowinput="true" valuefromselect="true" onvaluechanged="returnreasonChanged" />
+                </td>
+            </tr>
+            <tr>
+                <td class="td1">原因</td>
+                <td class="td2" colspan="3">
+                    <textarea id="txtReturnreason" style="width: 96%; height: 60px;"></textarea></td>
+            </tr>
+            <tr>
+                <td colspan="4">
+                    <div class="win_btn" style="text-align: center;">
+                        <a class="mini-button" iconcls="icon-ok" onclick="saveReturnreasonFn">保存</a>&nbsp;
+                        <a class="mini-button" iconcls="icon-cancel" onclick="cancelReturnreason">取消</a>
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </div>
+
+    <script> 
+        function orderStatusRenderer(e) {
+            var grid = e.sender;
+            var record = e.record;
+            var statestr = getOrderStatestrByState(record.OrderState);
+            var html = "<div style=\"display:flex;flex-direction:column;\">";
+            html += ("<div onclick=\"clickToLog('" + record.ctid + "')\" style=\"color:blue;margin-bottom:10px;\">" + statestr + "</div>");
+            var taostatus = getInitStatusstrByState(record.status);
+            html += ("<div>" + taostatus + "</div>");
+            html += "</div>";
+            return html;
+        }
+
+        function orderCusRenderer(e) {
+            var grid = e.sender;
+            var record = e.record;
+
+            var html = "<div style=\"display:flex;flex-direction:column;align-items:center;\">";
+            html += ("<a style=\"color:#0090FF;\">" + record.CustomerUserName + "</a>");
+            html += ("<a style=\"color:#0090FF;\">" + record.DesignUserName + "</a>");
+            html += "</div>";
+            return html;
+        }
+        function orderPTimeRenderer(e) {
+            var grid = e.sender;
+            var record = e.record;
+
+            var html = "<div style=\"display:flex;flex-direction:column;\">";
+            html += ("<div>" + record.seller_nick + "</div>");
+            html += getWWurlByNick(record.buyer_nick);
+            html += ("<div>" + formatCommonDate(record.pay_time) + "</div>");
+            html += "</div>";
+            return html;
+        }
+        //查询按钮
+        function searchFn() {
+            var form = new mini.Form("#ctl00_f_all");
+            var data = form.getData(true, false);
+            var s = data;
+
+            grid.load({
+                ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, customer: s.customer, orderState: s.state, address: s.address,
+                date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, supplier: s.supplier,
+                seller_memo: s.memo, backdate1: s.backdate1, backdate2: s.backdate2, backtype: s.backtype, otherMemo: s.otherMemo
+            });
+        }
+        //清除查询内容
+        function clearFn() {
+
+            var form = new mini.Form("#ctl00_f_all");
+            form.clear();
+            mini.get("aSearchMonth").setChecked(false);
+            mini.get("aSearchDay").setChecked(false);
+            mini.get("aSearchWeek").setChecked(false);
+        }
+
+        function actionRenderer(e) {
+            var record = e.record;
+            var id = record.ctid;
+            var html = "";
+            html += getGridBtn("view", "拒绝", "refuseOrder('" + id + "')");
+            if (userPostCode == "Supplier") {
+                html += getGridBtn("view", "同意", "agreeSupplierOrder('" + id + "')");
+            } else {
+                html += getGridBtn("view", "同意", "agreeOrder('" + id + "')");
+            }
+            return html;
+        }
+
+        function refuseOrder() {
+            var rec = grid.getSelected();
+            mini.prompt("请输入原因:", "拒绝",
+                function (action, value) {
+                    if (action == "ok") {
+                        var parms = new Object();
+                        parms.ctid = rec.ctid;
+                        parms.returnreason = value;
+                        postAjax("refuseBackOrder", parms, function (data) {
+                            resultShow(data, "grid.reload();");
+                        });
+                    } else {
+
+                    }
+                },
+                true
+            );
+        }
+        function agreeSupplierOrder(e) {
+            var rec = rec = grid.getSelected();
+            $("#returnreason_id").val(e);
+            $("#selectTar").hide();
+            mini.get("returnreason_win").show();
+        }
+        function agreeOrder(e) {
+            var rec = rec = grid.getSelected();
+            $("#returnreason_id").val(e);
+            $("#selectTar").show();
+            mini.get("returnreason_win").show();
+        }
+
+        function cancelReturnreason() {
+            mini.get("returnreason_win").hide()
+        }
+
+        function saveReturnreasonFn() {
+            let parms = {};
+            parms.ctid = $("#returnreason_id").val();
+            parms.returnreason = $("#txtReturnreason").val();
+            if (userPostCode != "Supplier") {
+                parms.totype = $("#selectTar select option:selected").val();
+            }
+            postAjax("ins_erp_returnreason", parms, function (data) {
+                if ($("#selectReturnreason").is(':visible')) {
+                    mini.get("selectReturnreason").setValue("");
+                }
+                $("#txtReturnreason").val("");
+                mini.get("returnreason_win").hide();
+                resultShow(data, "grid.reload();");
+            });
+        }
+
+        function returnreasonChanged(e) {
+            $("#txtReturnreason").val("").val(e.value);
+        }
+
+        let returnreason_list = [{
+            title: "客服撤"
+        }, {
+            title: "设计撤"
+        }, {
+            title: "售后撤"
+        }, {
+            title: "审稿撤"
+        }, {
+            title: "设计 尺寸不符"
+        }, {
+            title: "设计 未转曲"
+        }, {
+            title: "设计 文件没标孔"
+        }, {
+            title: "设计 款数不符 "
+        }, {
+            title: "设计 文件含无效轮廓"
+        }, {
+            title: "设计 数量不明确"
+        }, {
+            title: "设计 文件名直角文件模切"
+        }, {
+            title: "设计 文件名模切文件直角"
+        }, {
+            title: "设计 文件名双面 文件单面"
+        }, {
+            title: "设计 文件名单面 文件双面"
+        }, {
+            title: "设计 文件打不开"
+        }, {
+            title: "设计 文件打开空白"
+        }, {
+            title: "设计 文件带R标 需要提供商标注册+印刷委托书 或者 营业执照+印刷委托书 两者取一种 必需带公章"
+        }, {
+            title: "设计 没按固定刀版设计"
+        }, {
+            title: "设计 双面左右放 竖着排一列"
+        }, {
+            title: "设计 打码位置不够 要留35x7mm"
+        }, {
+            title: "设计 内页是否设计反了"
+        }, {
+            title: "设计 刀版间距不够 至少要3mm以上"
+        }, {
+            title: "设计 文件有RGB色值"
+        }, {
+            title: "设计 刀版跟出血卡边 会模切不准"
+        }, {
+            title: "设计 底色要不要"
+        }, {
+            title: "设计 打印没有这个尺寸的刮刮膜 具体看报价系统"
+        }, {
+            title: "设计 没做出血"
+        }, {
+            title: "设计 没做刀版"
+        }, {
+            title: "设计 划痕划到字"
+        }, {
+            title: "设计 文件糊 直接做吗"
+        }, {
+            title: "设计 图片超出画面框"
+        }, {
+            title: "设计 刮奖区虚线偏大文件图片没法调整 贴膜的位置要比膜的尺寸一边小3mm"
+        }, {
+            title: "设计 文件里面需要放杯子图片跟口径"
+        }, {
+            title: "设计 烫金不是矢量文件"
+        }, {
+            title: "设计 白墨需要做白墨版"
+        }, {
+            title: "设计 烫金最小尺寸英文3mm以上中文5mm以上线条0.5mm以上间距不够0.5mm 糊"
+        }, {
+            title: "设计 棉卡印不了底色 底色是材质色"
+        }, {
+            title: "设计 奖项没有备注数量"
+        }, {
+            title: "设计 牙签粘哪里 做好示意图 "
+        }, {
+            title: "设计 台湾地址文件里面要放客户身份证号 "
+        }, {
+            title: "客服 超成本"
+        }, {
+            title: "客服 地址上传系统"
+        }, {
+            title: "客服 特种纸不覆膜"
+        }, {
+            title: "客服 实际金额拍了多少 额外备注备注一下"
+        }, {
+            title: "客服 老客户要及时上传"
+        }, {
+            title: "客服 搜不到之前文件 是否有改名字或者换号 额外备注 备注一下"
+        }, {
+            title: "客服 文件名不规范"
+        }, {
+            title: "客服 额外备注车间看不到"
+        }, {
+            title: "客服 未按报价系统报价"
+        }, {
+            title: "设计 文件名模切文件圆角"
+        }, {
+            title: "设计 文件名直角文件圆角"
+        }, {
+            title: "设计 总数不符"
+        }];
+
+        $(() => {
+            mini.get("selectReturnreason").setData(returnreason_list);
+        });
+    </script>
+
+</asp:Content>
+

+ 53 - 0
Web/EDelivery/ApplyBack.aspx.cs

@@ -0,0 +1,53 @@
+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 EDelivery_ApplyBack : BasePage
+{
+    protected override void OnPreInit(EventArgs e)
+    {
+        _repTitle = "申请打回列表";
+        PmTag = "applyBack";
+        //_selfCheckPermission = true;
+        _keyFilterVisible = false;
+        _addVisible = false;
+        _filterItem = "cus,order,shop,wang,shouhuo,supplier,des,memo";
+        _filterDateBtn = false;
+    }
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        
+        if (!IsPostBack)
+        {
+            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();
+            AppendScript("userPostCode='" + CurrentUser.UserPost.Post.Code + "';");
+            AppendScript("viewUrl='" + webConfig.ltFileSiteUrl + "/d/fx';uploadUrl ='" + webConfig.ltSimUploadUrl + "?ut=fx';");
+            AppendScript("downUrl='" + webConfig.ltDownLoadUrl + "';");
+            AppendScript("userId='" + CurrentUser.UserID + "';");
+            AppendScript("cdrImgUrl='" + webConfig.ltFileSiteUrl + "/d/ws';");
+        }
+        //foreach (DataRow dr in dt.Rows)
+        //{
+        //}
+    }
+}

+ 1 - 1
Web/EOrder/OrderList.aspx

@@ -191,7 +191,7 @@
         <li name="edit" iconcls="icon-mation" onclick="onOriFileVisit('AUTH_FILE')">授权文件</li>
         <!--<li name="edit" iconcls="icon-split" onclick="onOpenTemplate">查看模板</li>-->
         <li name="edit" iconcls="icon-split" onclick="viewTempImage">查看模板图片</li>
-        <!-- <li name="edit" iconcls="icon-hostrepertory" onclick="onOpenInvoice">发票</li> -->
+        <li name="edit" iconcls="icon-hostrepertory" onclick="applyBack">申请打回</li>
     </ul>
 
 

+ 7 - 0
Web/EOrder/js/p_order.js

@@ -1458,6 +1458,13 @@ function onCopyUpLoaderUrl(e) {
     window.open(url, '_blank');
 }
 
+function applyBack() {
+    var rec = grid.getSelected();
+    postAjax("applyOrderBack", { ctid: rec.ctid }, function (data) {
+        resultShow(data, "grid.reload();");
+    });
+}
+
 function downloadFileFn(e) {
 
 

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini