川印集团项目
parent: 4a16f96c | 补丁 | 提交 | show whitespace
username@email.com
2025-03-14 2605af51ca4787434c8c5f2b10dc0adc78a2fdb0 
外协管理，外协订单，你列表操作后面增加一个完工点，完工就进行。就是说，已完工处理好，前面呢，有个批量完工，好检索查询条件，也加个完工。

外协订单也要点  受理  完工  送货
6个文件已修改
173 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx 146 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs


@@ -2075,7 +2075,7 @@


                if (string.IsNullOrEmpty(Keyids))


                    return null;//错误数据返会空 




                IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("*", "EC_OrderBasic", string.Format(" Keyid in ({0}) and SellerId ='{1}' order by SellerOrderId DESC ", Keyids, FirmId)) as IList<EC_OrderBasic>;//执行查询


                IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("*", "EC_OrderBasic", string.Format(" Keyid in ({0})  order by SellerOrderId DESC ", Keyids)) as IList<EC_OrderBasic>;//执行查询 and SellerId ='{1}' , FirmId




                return result;//返回结果


            }




 CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx


@@ -5,7 +5,7 @@


<head id="Head1" runat="server">


    <title>外协订单</title>


    <uc:CMSHead ID="CMSHead1" runat="server" />


    <script src="../../js/business/Order.js" type="text/javascript"></script>


    <script src="../../js/business/Order.js?v=1" type="text/javascript"></script>


    <style type="text/css">


        span.hand:hover { text-decoration: underline; }


        span.hand_no { display: block; font-size: 14px; font-weight: bold; font-family: 幼圆; color: Red; }


@@ -101,6 +101,131 @@


            var url = "/Pages/business/Waixiefukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;


            top.Dialog.open({ URL: url, Title: "外协付款申请", Height: 600, Width: 580 });


        }








        /*


确认受理


*/


        function ToAcceptwaixie(sumPrice, orderShowId, orderId, orderTypeId) {


            //var commission = parseFloat(document.getElementById('txtCommission').value);


            //if (isNaN(commission)) return;




            //    var html = '';


            //    html += '<div style="padding:15px">';


            //    html += orderTypeId > 0 ? ('确认受理订单:<b>' + orderShowId + '</b>?') : ('受理订单:<b>' + orderShowId + '</b>需要支付￥<b>' + Float2(commission * sumPrice) + '</b>服务费,是否确认受理？<br>');


            //    html += '</div>';


            //    html += '<br/><div style=\'text-align:right;\' ><input type="button" class="button" value="受 理" onclick="DoAccept(' + orderId + ')"/>&nbsp;&nbsp;<input type="button" class="button" value="取 消" onclick="parent.dialog.close()"/></div>';


            //    dialog.open({ InnerHtml: html, Title: '确认受理', Width: 200, Height: 100, Modal: false });




            var msg ='确认受理订单:' + orderShowId + '?';


            top.Dialog.confirm(msg, function () {


                DoAcceptwaixie(orderId);


            });


        }








      


        /*


        处理受理订单


        */


        var DoAcceptwaixie = function (orderId) {


            window.submitUrl = "/Pages/business/OrderList.aspx"; //设置当前页的提交路径


            CallServer({ Target: "AcceptOrder", id: orderId }, function (data, textStatus) {


                if ('1' == data) {


                    alertMsg('操作成功！');


                    RefreshDIVOpener();   //关闭页面


                } else {


                    alertMsg('-1' == data ? '受理过程中发生异常，请重新受理！' : '受理失败！');


                    //dialog.close();


                }


            });


        }






        ///批量受理


        function ToAllAcceptwaixie() {


            //var commission = parseFloat(document.getElementById('txtCommission').value);


            //if (isNaN(commission)) return;


            var ids = '';


            var cks = $("input[name='ckId']:checked");


            if (cks.length == 0) { alertMsg('没有选中任何项！'); return; } else { }


            var isCan = true;


            var needPrice = false;


            var price = 0;


            var orderShowIds = '';


            cks.each(


                function () {


                    var ckVal = $(this).val();


                    var ckValJson = eval('(' + ckVal + ')');


                    if (ckValJson.orderState != 1) {


                        isCan = false;


                        return false;


                    }


                    ids = ids + ',' + $(this).attr("value_keyid");


                    orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;


                    //if (ckValJson.orderType < 1) {


                    //    needPrice = true;


                    //    price += parseFloat(ckValJson.sumPrice) * commission;


                    //}


                }


            );


            if (!isCan) {


                alertMsg('请选择未受理的订单！');


            }


            else {


                if (ids != '') {


                    ids = ids.substring(1);


                }


                if (orderShowIds != '') {


                    orderShowIds = orderShowIds.substring(1);


                }


                //            var html = '';


                //            html += '<p>';


                //            html += !needPrice ? ('确认批量受理所选<b>' + orderShowIds + '</b>订单?') : ('受理所选线上订单需要支付￥<b>' + Float2(price) + '</b>服务费,是否确认批量受理<b>' + orderShowIds + '</b>订单？<br>');


                //            html += '</p>';


                //            html += '<br/><div style=\'text-align:right;\' ><input type="button" class="button" value="受 理" onclick="DoAcceptAll(\'' + ids + '\')"/>&nbsp;&nbsp;<input type="button" class="button" value="取 消" onclick="parent.dialog.close()"/></span></div>';


                //            dialog.open({ InnerHtml: html, Title: '批量确认受理', Width: 400, Height: 100, Modal: false });


                var msg = '确认批量受理所选' + orderShowIds + '订单?';


                top.Dialog.confirm(msg, function () {


                    DoAcceptAllwaixie(ids);


                });


            }


        }






        /*


批量处理受理订单


*/


        var DoAcceptAllwaixie = function (orderIds) {


            window.submitUrl = "/Pages/business/OrderList.aspx"; //设置当前页的提交路径


            CallServer({ Target: "AcceptOrderAll", ids: orderIds }, function (data, textStatus) {


                if ('1' == data) {


                    alertMsg('操作成功！');


                    RefreshDIVOpener();   //关闭页面


                } else {


                    alertMsg('-1' == data ? '受理过程中发生异常，请重新受理！' : '受理失败！');


                    //dialog.close();


                }


            });


        }






        function CompledWork(orderId) {


            var url = "/Pages/business/CompledWork.aspx?ids=" + orderId;


            top.Dialog.open({ URL: url, Title: "完工", Height: 300, Width: 680 });


        }








        function DeliverWork(orderId, orderCode, orderState) {


            var url = "/Pages/business/DeliverWork.aspx?ids=" + orderId;


            url += "&OrderShowId=" + orderCode;


            url += "&OrderState=" + orderState;


            top.Dialog.open({ URL: url, Title: "送货", Height: 450, Width: 680 });


        }




    </script>


</head>


<body>


@@ -170,6 +295,16 @@


                            <a href="javascript:;" menu_member_case_id="case_waixiefukuan" menu_member_case_name="外协付款申请"  onclick="ToWaixieFukuan()"><span class="icon_edit">外协付款申请</span></a>


                              <div class="box_tool_line">


                            </div>


                            


                            <a href="javascript:;" menu_member_case_id="case_ToAllAcceptList" menu_member_case_name="批量受理" onclick="ToAllAcceptwaixie();"><span class="icon_edit">批量受理</span></a>


                            <div class="box_tool_line">


                            </div>


                            <a href="javascript:;" menu_member_case_id="case_ToCompledList" menu_member_case_name="批量完工" onclick="ToCompled();"><span class="icon_edit">批量完工</span></a>


                            <div class="box_tool_line">


                            </div>


                             <a href="javascript:;" menu_member_case_id="case_ToSonghuoList" menu_member_case_name="批量送货" onclick="ToDeliverWork();"><span class="icon_edit">批量送货</span></a>


                            <div class="box_tool_line">


                                 </div>


                            <a style="color: #666; cursor: inherit;">(如果外协给线上厂商的订单被受理，那么此外协订单不可再修改，也不可删除。)</a>


                        </div>


                    </div>


@@ -234,7 +369,8 @@


                                    id:<%#Eval("Keyid")%>,


                                    buyerId:'<%#Eval("BuyerId")%>',


                                    SellerId:'<%#Eval("SellerId")%>',


                                         orderId:'<%#Eval("SellerOrderId")%>'


                                         orderId:'<%#Eval("SellerOrderId")%>',


                                         orderState:<%#Eval("OrderState")%>


                                    }" id='ckBox<%#Container.ItemIndex%>' class='ckBox' />


                                </td>


                                <td>


@@ -267,15 +403,15 @@


                                    <%#Eval("SumPrice","{0:F2}")%>


                                </td>


                                <td style="text-align: center;">


                                    <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "受理") ? "hand_yes" : "hand_no"%>">


                                    <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "受理") ? "hand_yes" : "hand_no"%>"  <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "受理") ? "" : "onclick=\"ToAcceptwaixie("+Eval("SumPrice" )+",'"+ Eval("SellerOrderId")+"',"+Eval("Keyid")+","+Eval("OrderTypeId")+")\""%>  >


                                        <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "受理") ? "√" : "×"%></span>


                                </td>


                                <td style="text-align: center;">


                                    <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "完工") ? "hand_yes" : "hand_no"%>">


                                    <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "完工") ? "hand_yes" : "hand_no"%>"  <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "受理") ? "onclick=\"CompledWork("+Eval("Keyid")+")\"" : ""%>  >


                                        <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "完工") ? "√" : "×"%></span>


                                </td>


                                <td style="text-align: center;">


                                    <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "送货") ? "hand_yes" : "hand_no"%>">


                                    <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "送货") ? "hand_yes" : "hand_no"%>"  <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "受理") ? "onclick=\"DeliverWork("+Eval("Keyid" )+",'"+ Eval("SellerOrderId")+"','"+Eval("OrderState")+"')\"" : ""%> >


                                        <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "送货") ? "√" : "×"%></span>


                                </td>


                                <td>




 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx


@@ -69,7 +69,7 @@


                      <td class="ali03 " style="width: 120px;">注意事项：</td>
                     
                     




                    <td style=" text-align:left;" colspan="3">



                    <textarea id="txtZhuyishixiang" name="txtZhuyishixiang" runat="server" style="width: 402px; height: 30px;" class="req" maxlength="200"></textarea>



                    <textarea id="txtZhuyishixiang" name="txtZhuyishixiang" runat="server" style="width: 402px; height: 30px;"   maxlength="200"></textarea>



                </td>


                   


                </tr>





 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs


@@ -245,7 +245,7 @@


                    }


                    oA_DeliverPlanPaiche.Keyid = Keyid;


                    oA_DeliverPlanPaiche.DeliverTime = this.txtDeliverTime.Value.ToDateTime2();


                    oA_DeliverPlanPaiche.Remark = dingdanhao.Trim(',')+"。" + this.txtZhuyishixiang.Value;


                    oA_DeliverPlanPaiche.Remark = /*dingdanhao.Trim(',')+"。" +*/ this.txtZhuyishixiang.Value;


                    oA_DeliverPlanPaiche.shuliang = ids.Length;


                  var  oA_DeliverPlans =  _OA_DeliverPlanPaicheBLL.GetModelByDeliveredTime(CurrentUser.MemberId, oA_DeliverPlanPaiche.DeliverTime.Value).Max(x=>x.Sort);


                    if (oA_DeliverPlans.HasValue)




 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx


@@ -162,7 +162,7 @@


                联系电话：


            </td>


            <td align="left">


                 <input id='txtDianhua' class='req' runat="server"  maxlength="200" />


                 <input id='txtDianhua'  runat="server"  maxlength="200" />


            </td>


       


         


@@ -172,7 +172,7 @@


                收货地址：


            </td>


            <td align="left">


                <input id='txtDizhi' class='req' runat="server"  maxlength="200" style="width:300px;" />


                <input id='txtDizhi'   runat="server"  maxlength="200" style="width:300px;" />


            </td>


            <td align="right">


               送货时间：




 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs


@@ -34,6 +34,7 @@




        OA_CarManageBll _OA_CarManageBll = null;


        OA_DeliverPlanPaicheBLL oA_DeliverPlanBLL = null;


        OA_StaffBLL _OA_StaffBLL = null;




        //初始化


        public DeliverPlanPaicheEdit()


@@ -42,6 +43,7 @@


          


            _OA_CarManageBll = new OA_CarManageBll();


            oA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();


            _OA_StaffBLL = new OA_StaffBLL();






        }


@@ -107,9 +109,22 @@


                this.selBuyerId.DataSource = corporateClients;


                this.selBuyerId.DataBind();


                this.selBuyerId.Items.Insert(0, new ListItem("请选择", ""));


                var  oA_CarManages = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);


                foreach (var oA_CarManage  in oA_CarManages)


                {


                    if (oA_CarManage.StaffID.HasValue)


                    {


                      var oA_Staff  =  _OA_StaffBLL.GetModelByKeyid(oA_CarManage.StaffID);


                        if (oA_Staff != null)


                        {


                            oA_CarManage.CarNumber = oA_CarManage.CarNumber + "(" + oA_Staff.Name + ")";


                        }


                    }






                this.selCarId.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);


                }




                this.selCarId.DataSource = oA_CarManages;


                this.selCarId.DataTextField = "CarNumber";


                this.selCarId.DataValueField = "Keyid";


                this.selCarId.DataBind();