添加问题反馈筛选

SiteCore/Handler/sync.order.cs

@@ -47,6 +47,7 @@ using static System.Net.Mime.MediaTypeNames;
 using System.Runtime.Remoting.Metadata.W3cXsd2001;
 using NPOI.Util;
 using static NPOI.HSSF.Util.HSSFColor;
+using BizCom.Enum;
 
 namespace SiteCore.Handler
 {
@@ -78,7 +79,7 @@ namespace SiteCore.Handler
             //commonHelper.loginGetOrder(2152);
 
             //string res = apiHelper.API_GetWaybill("YTO-PDD-CYT", "250703-469248284251412");
-        
+
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
             string date1 = GetPostString("date1");
@@ -13202,7 +13203,23 @@ namespace SiteCore.Handler
             {
                 lw.Add("IssueState = 1");
             }
-            lw.Add("IssueState > 0");
+            else
+            {
+                string iisstate = GetPostString("iisstate");
+                if ("1".Equals(iisstate))
+                {
+                    lw.Add("IssueState =1");
+                }
+                else if ("2".Equals(iisstate))
+                {
+                    lw.Add("IssueState = 2");
+                }
+                else
+                {
+                    lw.Add("IssueState > 0");
+                }
+            }
+
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());
             DataTable dt = WebCache.GetData("view_ErpTradeCellIssue", dStruct);
             writeGridDataTableJson(dStruct.TotalCount, dt);

Web/EAfterSale/IssueContent.aspx

@@ -42,7 +42,7 @@
             //form.setIsValid(false);
             //console.log("565656565", data);
             grid.load({
-                ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, supplier: s.supplier,
+                ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, orderState: s.state, supplier: s.supplier, iisstate: s.iisstate
             });
         }
         function orderPTimeRenderer(e) {

Web/EAfterSale/IssueContent.aspx.cs

@@ -19,7 +19,7 @@ public partial class EAfterSale_IssueContent : BasePage
         //_selfCheckPermission = true;
         _keyFilterVisible = false;
         _addVisible = false;
-        _filterItem = "order,shop,cus,design,wang";
+        _filterItem = "order,shop,cus,design,wang,iisstate";
         _filterDateBtn = false;
     }
 

Web/EDelivery/js/SupplierOrder.js

@@ -92,20 +92,20 @@ function supplierBackFn(ctid) {
                         if (data != "操作成功！") {
                             mini.confirm(data, "确定？",
                                 function (action) { }
-                        }
-                        );
-                    resultShow(data, "grid.reload();");
-                });
-    } else {
+                            )
+                        };
+                        resultShow(data, "grid.reload();");
+                    });
+                } else {
 
-    }
-},
-true
+                }
+            },
+            true
         );
     }
     else {
-    mini.alert("请选中一行记录！");
-}
+        mini.alert("请选中一行记录！");
+    }
 }
 
 function verifyFn(ctid) {

Web/EOrder/OrderList.aspx

@@ -715,7 +715,7 @@
             </tr>
         </table>
     </div>
-    <div id="uploaderAddress_win" class="mini-window" title="上传文件地址" style="width: 1300px; height: 300px; position: relative; display: none">
+    <div id="uploaderAddress_win" class="mini-window" title="上传文件地址" style="width: 1500px; height: 300px; position: relative; display: none">
         <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
             <tr>
                 <td class="td1">文件地址</td>
@@ -731,6 +731,8 @@
                 <td class="td1">文件名</td>
                 <td class="td1">数量</td>
                 <td class="td1">备注</td>
+                <td class="td1">收件人</td>
+                <td class="td1">手机号</td>
                 <td class="td1">省</td>
                 <td class="td1">市</td>
                 <td class="td1">区</td>
@@ -749,6 +751,12 @@
                 <td class="td1">
                     <input class="address-input" data-name="memo" />
                 </td>
+                <td class="td1">
+                    <input class="address-input" data-name="receiver" />
+                </td>
+                <td class="td1">
+                    <input class="address-input" data-name="mobile" />
+                </td>
                 <td class="td1">
                     <input class="address-input" data-name="province" />
                 </td>
@@ -763,7 +771,7 @@
                 </td>
             </tr>
             <tr>
-                <td colspan="8">
+                <td colspan="10">
                     <div class="win_btn" style="text-align: center;">
                         <a class="mini-button" iconcls="icon-ok" onclick="saveUploaderAddressFn">确定</a>&nbsp;
                         <a class="mini-button" iconcls="icon-cancel" onclick="cancelUploaderAddressFn">取消</a>
@@ -1012,7 +1020,7 @@
         async function saveUploaderAddressFn() {
             const trs = document.getElementById("uploaderAddress_win").querySelectorAll("tr");
             let list = [];
-            let data_list = [["订单号", "文件名", "数量", "省", "市", "区", "地址", "备注"]];
+            let data_list = [["订单号", "文件名", "数量", "备注", "收件人", "手机号", "省", "市", "区", "地址"]];
             trs.forEach(tr => {
                 let rows = {};
                 let inputs = tr.querySelectorAll("td input");
@@ -1030,44 +1038,44 @@
             let isAll = true;
             for (let i = 0; i < list.length; i++) {
                 let data_row = list[i];
-                let { tid, seller_memo, number, memo, province, city, area, address } = list[i];
+                let { tid, seller_memo, number, memo, province, city, area, address, receiver, mobile } = list[i];
                 if (Object.keys(data_row).filter(value => { return data_row[value] == "" }).length == data_row.length) {
                     continue;
                 }
-                if (!tid || !seller_memo || !number || !province || !city || !area || !address) {
+                if (!tid || !seller_memo || !number || !province || !city || !area || !address || !receiver || !mobile) {
                     isAll = false;
                     break;
                 }
-                data_list.push([tid, seller_memo, number, memo, province, city, area, address]);
+                data_list.push([tid, seller_memo, number, memo, receiver, mobile, province, city, area, address]);
             }
 
             if (data_list.length == 1) {
-                 isAll = false;
-             }
-             if (!isAll) {
-                 return mini.showTips({
-                     content: "请填写完整信息！",
-                     state: "danger",
-                     x: "Center",
-                     y: "Center",
-                     timeout: 1000
-                 });
-             }
-              let result = await createXlsx(data_list);
-             if (!result) {
-                 return mini.showTips({
-                     content: "上传文件失败！",
-                     state: "danger",
-                     x: "Center",
-                     y: "Center",
-                     timeout: 1000
-                 });
-             }
-             let params = { tid: uploaderAddressTid, atta: result };
-             postAjax("set_tid_attachments", params, function (data) {
-                 resultShow(data, "grid.reload();");
-                 mini.get("uploaderAddress_win").hide();
-             });
+                isAll = false;
+            }
+            if (!isAll) {
+                return mini.showTips({
+                    content: "请填写完整信息！",
+                    state: "danger",
+                    x: "Center",
+                    y: "Center",
+                    timeout: 1000
+                });
+            }
+            let result = await createXlsx(data_list);
+            if (!result) {
+                return mini.showTips({
+                    content: "上传文件失败！",
+                    state: "danger",
+                    x: "Center",
+                    y: "Center",
+                    timeout: 1000
+                });
+            }
+            let params = { tid: uploaderAddressTid, atta: result };
+            postAjax("set_tid_attachments", params, function (data) {
+                resultShow(data, "grid.reload();");
+                mini.get("uploaderAddress_win").hide();
+            });
         }
         async function createXlsx(data) {
             const wb = XLSX.utils.book_new();
@@ -1143,6 +1151,12 @@
                 <td class="td1">
                     <input class="address-input" data-name="memo" />
                 </td>
+                <td class="td1">
+                    <input class="address-input" data-name="receiver" />
+                </td>
+                <td class="td1">
+                    <input class="address-input" data-name="mobile" />
+                </td>
                 <td class="td1">
                     <input class="address-input" data-name="province" />
                 </td>

Web/MasterPage/ErpView.master

@@ -567,6 +567,14 @@
                     <option value="0">未绑定</option>
                 </select>
             </div>
+            <div class="filter_item" id="f_iisstate" runat="server" visible="false">
+                <label>反馈状态</label>
+                <select class="mini-combobox inp_middle" name="iisstate" id="txtIistate">
+                    <option value=""></option>
+                    <option value="1">未处理</option>
+                    <option value="2">已处理</option>
+                </select>
+            </div>
             <div class="filter_item" id="f_refundstate" runat="server" visible="false">
                 <label>退款状态</label>
                 <select class="mini-combobox inp_middle" name="refundState" id="textRefundState">

Web/MasterPage/ErpView.master.cs

@@ -158,6 +158,7 @@ public partial class MasterPage_ErpView : System.Web.UI.MasterPage
                 if (fArr.Contains("overtime")) f_overtime.Visible = true;//
                 if (fArr.Contains("refundstate")) f_refundstate.Visible = true;//退款状态
                 if (fArr.Contains("spudata")) f_spudata.Visible = true;//退款状态
+                if (fArr.Contains("iisstate")) f_iisstate.Visible = true;//退款状态
 
             }
             else