Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

YL

2022-01-26 2bf363bd6e2bcfdf024bbecf2f14ae309dcc0fe8

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -151,10 +151,7 @@
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            //初始化表格
            set_InitGrid();
            //加载数据到网格
            get_Display(sWhere);
            set_ClearBill();
            //#endregion

            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等
@@ -249,6 +246,12 @@


            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                //加载数据到网格
                get_Display(sWhere);
            }
            //初始化表格
            function set_InitGrid() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -350,21 +353,10 @@
            //加载网格
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
                if (sWhere == "") {
                    var HBeginDate = $("#HBeginDate").val();//开始日期
                    var HEndDate = $("#HEndDate").val();//结束日期
                    if (HBeginDate) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                    }
                    if (HEndDate) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                    }
                    sWhere += " and ä¸šåŠ¡çŠ¶æ€ = '未分配' and ä¾›åº”商协同状态 ='未确认' ";
                }
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],},
                    data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            DataList = data1.data;