111

TradeManage/DingDan/DD_OrderGoodsMateForTM.aspx

@@ -4739,7 +4739,7 @@ var  glist= datagrid6.GetSelectListModel();
         function PostTemuOrderShipLabels() {
             var param = new Object();
             param.orderid = OrderId;
-            if ($("#temuShipChannel").val() == "") {
+            if (~~$("#temuShipChannel").val() == 0) {
                 alert("请选择发货渠道");
                 return;
             }
@@ -4747,6 +4747,7 @@ var  glist= datagrid6.GetSelectListModel();
             param.channelText = $("#temuShipChannel option:selected").text();
 
             param.shipCompanyId = $('#temuShipChannel option:selected').attr('companyid');
+            param.shipCompanyId = ~~param.shipCompanyId;
             param.warehouseId = $('#temuShipChannel option:selected').attr('warehouseId');
 
             if ($("#txt_tlong").val() == "") {

TradeManage/HuoWu/HW_GoodsDetailList2.aspx

@@ -314,7 +314,7 @@
                 if ($(this).val() != "") {
                     num = $(this).val();
                 }
-                Savebfnum4(did, num);
+                SavebManuaPrice(did, num);
             });
 
             $("input[tid]").live("keyup", function () {
@@ -323,7 +323,7 @@
                 if ($(this).val() != "") {
                     num = $(this).val();
                 }
-                Savebfnum5(did, num);
+                SavebTemuPrice(did, num);
             });
 
             $("#btn_hw3").bind("click", function () {
@@ -1862,7 +1862,7 @@
         }
 
 
-        function Savebfnum4(id, ManuaPrice) {
+        function SavebManuaPrice(id, ManuaPrice) {
             var param = new Object();
             param.detailid = id;
             param.ManuaPrice = ManuaPrice;
@@ -1876,7 +1876,7 @@
             });
         }
 
-        function Savebfnum5(id, TemuPrice) {
+        function SavebTemuPrice(id, TemuPrice) {
             var param = new Object();
             param.detailid = id;
             param.TemuPrice = TemuPrice;

TradeManageNew/DingDan/DT_SecondHand2.aspx

@@ -107,6 +107,7 @@ DingDan/DD_OrderListForTM2.aspx
     <script src="../Scripts/kindeditor/lang/zh_CN.js" type="text/javascript"></script>
     <script type="text/javascript">
 
+        var Model = null
         var datagrid1 = new nblf.ui.DataGrid("DataGrid1");
         var datagrid2= new nblf.ui.DataGrid("DataGrid2");
         var WindowLoadModel = new WindowLoad();
@@ -150,6 +151,12 @@ DingDan/DD_OrderListForTM2.aspx
         //#region 初始化DataGrid
         function CreateDataGrid() {
 
+            var col = new nblf.ui.DataGridColumn();
+            col.HeaderText = "TrackingCode";
+            col.CellTemplate = "<span>{Bind TrackingCode}</span>";
+            col.SortExpression = "c.TrackingCode";
+            Array.add(datagrid1.Columns, col);
+
             var col = new nblf.ui.DataGridColumn();
             col.HeaderText = "SKU";
             col.Width = "150px";
@@ -257,10 +264,10 @@ DingDan/DD_OrderListForTM2.aspx
                         break;
                     case 3:
                         // if(data.ShippingMethod==1){
-                            OptionStr += `<input onclick='' class='btnClass dgbtnEdit' type='button' value='预约提货时间'></input>`
+                            OptionStr += `<input onclick='ShowAppointmentTimeView(this)' class='btnClass dgbtnEdit' type='button' value='预约提货时间'></input>`
                             OptionStr += "<input onclick='DownloadReceipt(this)' class='btnClass dgbtnEdit' type='button' value='下载提货单'></input>";
                         // }else if(data.ShippingMethod==2){
-                            OptionStr += `<input onclick='GetOrderUsedSalePlatformLabel(${data.Id})' class='btnClass dgbtnEdit' type='button' value='选择物流渠道'></input>`
+                            OptionStr += `<input onclick='GetOrderUsedSalePlatformLabel(this)' class='btnClass dgbtnEdit' type='button' value='选择物流渠道'></input>`
                             OptionStr += "<input onclick='DownloadTrackCode(this)' class='btnClass dgbtnEdit' type='button' value='下载快递面单'></input>";
                         // }
                         OptionStr += "<input CommandName='dgbtnDel' onclick='MarkSell(this)' class='btnClass dgbtnEdit' type='button' value='标记卖出'></input>";
@@ -356,31 +363,33 @@ DingDan/DD_OrderListForTM2.aspx
 
             var col = new nblf.ui.DataGridColumn();
             col.HeaderText = "物流渠道";
-            col.CellTemplate = `<div class="product-box"><img src='{Bind ProductImageUrl}' alt='' width='50px' height='50px'/><a style="cursor: pointer;" onclick="LinkGoods({Bind ProductId})">{Bind SkuCode}</a></diav>`;
+            col.CellTemplate = "<span>{Bind ServiceType}</span>";
-            col.SortExpression = "c.SkuCode";
+            col.SortExpression = "c.ServiceType";
             Array.add(datagrid2.Columns, col);
 
             var col = new nblf.ui.DataGridColumn();
             col.HeaderText = "运费";
-            col.CellTemplate = `<div class="product-box"><img src='{Bind ProductImageUrl}' alt='' width='50px' height='50px'/><a style="cursor: pointer;" onclick="LinkGoods({Bind ProductId})">{Bind SkuCode}</a></diav>`;
+            col.CellTemplate = "<span>{Bind TotalNetCharge}</span>";
-            col.SortExpression = "c.SkuCode";
+            col.SortExpression = "c.TotalNetCharge";
+            Array.add(datagrid2.Columns, col);
+
+            //操作
+            col = new nblf.ui.DataGridColumn();
+            col.HeaderText = "操作";
+            col.Width = "100px";
+            col.CellTemplate = `<input onclick='ConfirmChannel({Bind TrackingCode})' class='btnClass dgbtnEdit' type='button' value='发货'></input>`;
             Array.add(datagrid2.Columns, col);
 
             datagrid2.SortExpression = "Id ";
             datagrid2.ViewSortDirection = "desc";
             datagrid2.IsFixHeader = false;
             datagrid2.ShowIndexColumn = false;
-            datagrid2.AllowPaging = true;
+            datagrid2.AllowPaging = false;
-            datagrid2.AllowPaging2 = true;
+            datagrid2.AllowPaging2 = false;
             datagrid2.ShowIndexColumn = false;
             datagrid2.Width = "100%";
             datagrid2.SelectMode = nblf.ui.SelectMode.None;
             datagrid2.Init();
-            datagrid2.Sorting(function () {
-                ReadData();
-            });
-            datagrid2.add_PageIndexChanged(function () { ReadData(); });
-
         }
         
         //#region 跳转到商品详情
@@ -399,6 +408,19 @@ DingDan/DD_OrderListForTM2.aspx
         }
         //#endregion
 
+        //#region 日期时间格式转换
+        function formatDateTime(isoString) {
+            var date = new Date(isoString);
+            var year = date.getUTCFullYear();
+            var month = String(date.getUTCMonth() + 1).padStart(2, '0');
+            var day = String(date.getUTCDate()).padStart(2, '0');
+            var hours = String(date.getUTCHours()).padStart(2, '0');
+            var minutes = String(date.getUTCMinutes()).padStart(2, '0');
+            var seconds = String(date.getUTCSeconds()).padStart(2, '0');
+
+            return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        }
+        
         //#region 批量下载条码图片
         function BatDownloadBarcode() {
             var SelectListModels = datagrid1.GetSelectListModel();
@@ -530,10 +552,14 @@ DingDan/DD_OrderListForTM2.aspx
             // 将条形码绘制到主画布
             ctx.drawImage(barcodeCanvas, 150, 120);
             
+            // 添加物流跟踪号
+            ctx.font = '40px SimHei';
+            ctx.fillText(`${item.TrackingCode}`, 30, 560);
+            
             // 添加分割线
             ctx.beginPath();
-            ctx.moveTo(30, 570); 
+            ctx.moveTo(30, 580); 
-            ctx.lineTo(870, 570); 
+            ctx.lineTo(870, 580); 
             ctx.strokeStyle = 'black';
             ctx.lineWidth = 3;
             ctx.stroke();
@@ -601,8 +627,10 @@ DingDan/DD_OrderListForTM2.aspx
         //#endregion
 
         //#region 获取物流列表
-        function GetOrderUsedSalePlatformLabel(Id) {
+        function GetOrderUsedSalePlatformLabel(obj) {
-            var param = { Id: Id }
+            var rowindex = $(obj).parent().parent().attr("index");
+            Model = datagrid1.Get_Model(rowindex);
+            var param = { Id: Model.Id }
             WindowLoadModel.Show();
             $.ajax({
                 url: "../DD_OrderServiceNew.asmx/GetOrderUsedSalePlatformLabel",
@@ -611,6 +639,7 @@ DingDan/DD_OrderListForTM2.aspx
                 success: function (data) {
                     WindowLoadModel.Hide();
                     if(data.d.Code==1){
+                        console.log(JSON.parse(data.d.Datas))
                         datagrid2.DataBind(JSON.parse(data.d.Datas));
                         $.fancybox({
                             'width': '40%',
@@ -633,16 +662,17 @@ DingDan/DD_OrderListForTM2.aspx
         //#endregion
 
         //#region 重新获取物流列表
-        function RetrieveOrderUsedSalePlatformLabel(Id) {
+        function RetrieveOrderUsedSalePlatformLabel() {
-            var param = { Id: Id }
+            var param = { Id: Model.Id }
             WindowLoadModel.Show();
             $.ajax({
                 url: "../DD_OrderServiceNew.asmx/RetrieveOrderUsedSalePlatformLabel",
                 data: Sys.Serialization.JavaScriptSerializer.serialize(param),
                 dataType: "json",
                 success: function (data) {
+                    WindowLoadModel.Hide();
                     if(data.d.Code==1){
-                        console.log(data.d.Datas)
+                        datagrid2.DataBind(JSON.parse(data.d.Datas));
                         // ReadData();
                     }else{
                         alert(data.d.Message);
@@ -651,6 +681,63 @@ DingDan/DD_OrderListForTM2.aspx
             });
         }
         //#endregion
+
+        //#region 确认发货渠道
+        function ConfirmChannel(TrackingCode) {
+            var param = { TrackingCode: TrackingCode }
+            console.log(param)
+        }
+        //#endregion
+
+        //#region 显示预约时间弹框
+        function ShowAppointmentTimeView(obj) {
+            var rowindex = $(obj).parent().parent().attr("index");
+            Model = datagrid1.Get_Model(rowindex);
+            $('#AppointmentTime').val(Model.AppointmentTime)
+            $.fancybox({
+                // 'width': '40%',
+                // 'height': '40%',
+                'autoScale': false,
+                'transitionIn': 'elastic',
+                'transitionOut': 'elastic',
+                'href': '#AppointmentTimeView',
+                'onComplete': function () {
+                }
+            });
+        }
+        //#endregion
+
+        
+        //#region 确认预约时间
+        function ConfirmAppointmentTime() {
+            var AppointmentTime = $('#AppointmentTime').val()
+            if(!AppointmentTime){
+                alert('请填写预约时间')
+                return
+            }
+            AppointmentTime = formatDateTime(AppointmentTime)
+            var param = { 
+                Id: Model.Id,
+                AppointmentTime: AppointmentTime
+            }
+            WindowLoadModel.Show();
+            $.ajax({
+                url: "../DD_OrderServiceNew.asmx/AppointmentPickupOrderUsedSalePlatform",
+                data: Sys.Serialization.JavaScriptSerializer.serialize(param),
+                dataType: "json",
+                success: function (data) {
+                    WindowLoadModel.Hide();
+                    if(data.d.Code==1){
+                        $("a.fancybox-close:visible").click()
+                        ReadData();
+                    }else{
+                        alert(data.d.Message);
+                    }
+                }
+            });
+        }
+        //#endregion
+        
     </script>
 
 </head>
@@ -694,12 +781,12 @@ DingDan/DD_OrderListForTM2.aspx
                 </select>
             </td>
             <td>
-                <input id="btn_sch" class="btnClass btnClassFind" type="button" value="查询" onclick="ReadData();" />
+                <input id="btn_sch" class="btnClass btnClassFind" type="button" value="Search" onclick="ReadData();" />
              </td>
         </tr>
         <tr class="orderType1">
             <td colspan="8">
-                <input id="btn_BatDownloadBarcode" class="btnClass btnClassEdit" type="button" value="批量下载条码图片" onclick="BatDownloadBarcode();"  />
+                <input id="btn_BatDownloadBarcode" class="btnClass btnClassEdit" type="button" value="Batch download barcode pictures" onclick="BatDownloadBarcode();"  />
                 <br />
                 <a id="a_select" style="color:red;font-weight:bolder"></a>
             </td>
@@ -733,9 +820,17 @@ DingDan/DD_OrderListForTM2.aspx
         </div>
     </div>
 
+    <!-- 自提预约时间弹框 -->
+    <div id="AppointmentTimeView" title="预约时间" style="display:none">
+        <div>选择预约时间</div>
+        <input type="datetime-local" id="AppointmentTime"/>
+        <input onclick='ConfirmAppointmentTime()' class='btnClass dgbtnEdit' type='button' value='确认'></input>
+    </div>
+
     <!-- 物流列表弹框 -->
     <div id="logisticsListView" title="选择物流渠道" style="width:600px; height:400px;display: none">
         <div id="DataGrid2" class="DataGridStyle"></div>
+        <input onclick='RetrieveOrderUsedSalePlatformLabel()' class='btnClass dgbtnEdit' type='button' value='重新获取'></input>
     </div>
 </body>
 </html>