zhuyiyi 4 сар өмнө
parent
commit
c005536c06

+ 1 - 1
SiteCore/Handler/sync.getbase.cs

@@ -57,7 +57,7 @@ namespace SiteCore.Handler
         }
         public void get_sel_designer()
         {
-            string sql = "select id, name from view_ErpUser where PostCode='Designer' or PostCode='wxDesigner' or PostCode='DesignerMr' or PostCode='wxDesignerMr' or OrgID = '10' or PostCode='Designerhd'";
+            string sql = "select id, name+'('+OrgName+')' as name from view_ErpUser where PostCode='Designer' or PostCode='wxDesigner' or PostCode='DesignerMr' or PostCode='wxDesignerMr' or OrgID = '10' or PostCode='Designerhd'";
             DataTable dt = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
             con.Response.Write(Utils.Serialization.JsonString.DataTable2MiniAjaxJson(dt));
         }

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
SiteCore/Handler/sync.order.cs


+ 5 - 9
Web/EOrder/OrderList.aspx

@@ -732,7 +732,6 @@
                 </td>
             </tr>
             <tr>
-                <td class="td1">订单号</td>
                 <td class="td1">文件名</td>
                 <td class="td1">数量</td>
                 <td class="td1">备注</td>
@@ -745,9 +744,6 @@
                 <td class="td1">#</td>
             </tr>
             <tr id="addressBase">
-                <td class="td1">
-                    <input class="address-input" data-name="tid" />
-                </td>
                 <td class="td1">
                     <input class="address-input" data-name="seller_memo" />
                 </td>
@@ -1041,7 +1037,7 @@
         let tagIds = [];
         let tagId = 0;
         let uploaderAddressTid = "";
-        function uploaderAddress(tid,fileName) {
+        function uploaderAddress(tid, fileName) {
             uploaderAddressTid = tid;
             //document.getElementById('address_file').value = "";
             $("#uploader_url").text("");
@@ -1064,7 +1060,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");
@@ -1082,15 +1078,15 @@
             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, receiver, mobile } = list[i];
+                let { seller_memo, number, memo, province, city, area, address, receiver, mobile } = list[i];
                 if (Object.keys(data_row).filter(value => { return data_row[value] == "" }).length == Object.keys(data_row).length) {
                     continue;
                 }
-                if (!tid || !seller_memo || !number || !province || !city || !area || !address || !receiver || !mobile) {
+                if (!seller_memo || !number || !province || !city || !area || !address || !receiver || !mobile) {
                     isAll = false;
                     break;
                 }
-                data_list.push([tid, seller_memo, number, memo, receiver, mobile, province, city, area, address]);
+                data_list.push([seller_memo, number, memo, receiver, mobile, province, city, area, address]);
             }
 
             if (data_list.length == 1) {

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно