From 0396dac1f2d02ce34bd3b20e66ff6713971fa655 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 12 一月 2022 18:12:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
index 1d3122d..73bdcb0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
@@ -113,7 +113,7 @@
, laydate = layui.laydate
, util = layui.util
//鏌ヨ鏉′欢
- var sWhere = " where 1 = 1 ";
+ var sWhere = "";
var option = [];
var Name = "Sc_PackUnionBillMain";
@@ -121,7 +121,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display(sWhere);
+ get_FastQuery(table, option);
//#endregion
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
//澶村伐鍏锋爮浜嬩欢
@@ -225,14 +225,7 @@
//鍔犺浇缃戞牸
function get_Display(sWhere) {
var wait = layer.load();//閬僵
- 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 + "'";
- }
+
$.ajax({
url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
type: "GET",
@@ -484,7 +477,7 @@
var index = layer.load(0);
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- sWhere = " where 1 = 1 ";
+ sWhere = " ";
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
@@ -494,8 +487,8 @@
$("#HMaterNumber").val("");
$("#HMaterName").val("");
$("#HMakerMan").val("");
- sWhere = " where 1 = 1 ";
- get_Display(sWhere);
+ sWhere = " ";
+ get_FastQuery(table, option);
}
//鍒锋柊
function set_Refresh() {
--
Gitblit v1.9.1