From b28acfba24adf4f1d2b567d0e2d99c29bd8c6d03 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期五, 07 六月 2024 13:50:53 +0800 Subject: [PATCH] 1 --- WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html index 145165f..ba19f8f 100644 --- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html +++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html @@ -127,6 +127,16 @@ </div> </div> <div class="layui-inline"> + <label class="layui-form-label">涓氬姟缁堟</label> + <div class="layui-input-block"> + <select id="HIsStop" name="HIsStop" lay-filter=""> + <option value="鍏ㄩ儴">鍏ㄩ儴</option> + <option value="鏄�">鏄�</option> + <option value="鍚�" selected>鍚�</option> + </select> + </div> + </div> + <div class="layui-inline"> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> @@ -472,7 +482,7 @@ var wait = layer.load();//閬僵 $.ajax({ type: "POST", - url: GetWEBURL() + "GetPOOrderBill", + url: GetWEBURL() + "GetPOOrderBill", //H_p_SRM_POOrderBillList async: true, data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere }, success: function (data1) { @@ -501,7 +511,7 @@ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 }); break; default: - if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�') { + if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�' || data[i].name == '鍓╀綑鏀舵枡鏁伴噺' || data[i].name == '鏈埌璐ф暟閲�' || data[i].name == '绱鏀舵枡鏁伴噺' || data[i].name == '鍓╀綑鍏ュ簱鏁伴噺' || data[i].name == '鍏ュ簱鏁伴噺') { col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true }); } else if (data[i].name == '渚涘簲鍟嗕氦鏈熷洖澶�') { col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' }); @@ -567,10 +577,10 @@ if ($("#HPURCHASEORGID").val() != "" && $("#HPURCHASEORGID option:selected").text() != "瀹夌憺闆嗗洟") sqlWhere += " and HPURCHASEORGID = ^^" + $("#HPURCHASEORGID").val() + "^^"; if ($("#HDate1").val() != "") { - sqlWhere += " and 閲囪喘鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^"; + sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^"; } if ($("#HDate2").val() != "") { - sqlWhere += " and 閲囪喘鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^"; + sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^"; } if ($("#HISGenerate").val() != "") { if ($("#HISGenerate").val() == "鏄�") { @@ -596,7 +606,16 @@ else if ($("#HIsFreeze").val() == "涓氬姟鍐荤粨") { sqlWhere += " and 涓氬姟鍐荤粨 = ^^涓氬姟鍐荤粨^^"; } + } + if ($("#HIsStop").val() != "") { + if ($("#HIsStop").val() == "鏄�") { + sqlWhere += " and 涓氬姟缁堟 = ^^涓氬姟缁堟^^"; + } + else if ($("#HIsStop").val() == "鍚�") { + sqlWhere += " and 涓氬姟缁堟 = ^^姝e父^^"; + } } + var Time = $("#Time").val(); if (Time > 0) { var dd = new Date(); -- Gitblit v1.9.1