From 266b2556a076f2d0b0b924c1088496e943d1bebb Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 25 三月 2022 16:37:21 +0800
Subject: [PATCH] 器具出入库列表界面增加以下过滤条件
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html | 16
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html | 159 ++++---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillList.html | 99 ++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html | 95 ++++
WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html | 98 ++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html | 99 ++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html | 97 ++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillList.html | 107 ++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBillList.html | 98 ++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillList.html | 98 ++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBillList.html | 99 +++-
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBillList.html | 97 ++++
12 files changed, 932 insertions(+), 230 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
index 94d8264..7d146ac 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
@@ -31,11 +31,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
+ <div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -54,18 +54,55 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--<div class="layui-colla-content">
+
+ <div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
</div>
-
- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -462,18 +499,40 @@
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ //var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 璋冨叆缁勭粐 like '%" + HStockOrgName + "%' or 璋冨嚭缁勭粐 like '%" + HStockOrgName+"%'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HDept) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 璋冨叆浠撳簱 like '%" + HWhName + "%' or 璋冨叆浠撳簱 like '%" + HWhName +"%'";
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -481,9 +540,15 @@
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html"
index 57027fc..49bdd8e 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html"
@@ -32,11 +32,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
+ <div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -55,18 +55,54 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--<div class="layui-colla-content">
+ <div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
</div>
-
- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -462,18 +498,43 @@
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ //var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 璋冨叆缁勭粐 like '%" + HStockOrgName + "%' or 璋冨嚭缁勭粐 like '%" + HStockOrgName+"%'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HDept) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 璋冨嚭浠撳簱 like '%" + HWhName + "%' or 璋冨叆浠撳簱 like '%" + HWhName +"%'";
+ }
+ //if (HSupName) {
+ // sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
+ //}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -481,9 +542,15 @@
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.html"
index 9751453..e4de32b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.html"
@@ -31,11 +31,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
+ <div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -54,18 +54,54 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--<div class="layui-colla-content">
+ <div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
</div>
-
- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -182,6 +218,7 @@
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 }
//, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
, { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
, { field: '鍙戞枡浠撳簱浠ｇ爜', title: '鍙戞枡浠撳簱浠ｇ爜', width: 125 }
, { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', width: 125 }
@@ -455,17 +492,42 @@
}
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HDept) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 浠撳簱 like '%" + HWhName + "%'";
+ }
+ if (HSupName) {
+ sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -473,9 +535,15 @@
//#endregion
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
index c26ae82..3ce9e64 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
@@ -30,11 +30,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
+ <div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -53,18 +53,55 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--<div class="layui-colla-content">
+
+ <div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
</div>
-
- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -179,6 +216,7 @@
, { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 125 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 }
//, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 }
, { field: '鏀舵枡浠撳簱ID', title: '鏀舵枡浠撳簱ID', width: 200, hide: true }
@@ -459,17 +497,42 @@
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HDept) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 浠撳簱 like '%" + HWhName + "%'";
+ }
+ if (HSupName) {
+ sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -477,9 +540,15 @@
//#endregion
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
index 5d61401..8e83fdf 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
@@ -58,6 +58,12 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -221,6 +227,7 @@
, { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', width: 200 }
, { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 200 }
, { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 200 }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
, { field: '鏀舵枡浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 200 }
, { field: '鏀舵枡浠撳簱', title: '浠撳簱鍚嶇О', width: 200 }
@@ -653,6 +660,7 @@
var HStatus = $("select[name='HStatus']").val();//鐘舵��
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
@@ -682,11 +690,14 @@
if (HEndDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
}
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
+ }
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
if (HDept) {
- sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HDept + "%'";
+ sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
}
if (HMaterNumber) {
sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
@@ -714,6 +725,9 @@
$("#HDept").val("");
$("#HMaterNumber").val("");
$("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.html"
index 10badb1..377aa63 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.html"
@@ -31,11 +31,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
+ <div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -54,18 +54,54 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--<div class="layui-colla-content">
+ <div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
</div>
-
- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -178,6 +214,7 @@
, { field: '璋冩嫧绫诲瀷', title: '璋冩嫧绫诲瀷', width: 100 }
, { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125 }
, { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 125 }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
, { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 125 }
, { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 125 }
@@ -457,27 +494,58 @@
}
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ //var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HDept) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 鍣ㄥ叿浠撳簱 like '%" + HWhName + "%'";
+ }
+ //if (HSupName) {
+ // sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
+ //}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html"
index e7c77f1..88adacd 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html"
@@ -31,11 +31,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
+ <div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -54,18 +54,53 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--<div class="layui-colla-content">
+ <div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
</div>
-
- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -180,6 +215,7 @@
, { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 125 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 }
//, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 }
, { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
@@ -458,17 +494,42 @@
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HDept) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 浠撳簱 like '%" + HWhName + "%'";
+ }
+ if (HSupName) {
+ sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -476,9 +537,15 @@
//#endregion
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillList.html"
index 52e230e..e8cf018 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillList.html"
@@ -31,11 +31,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
+ <div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -54,18 +54,53 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--<div class="layui-colla-content">
+ <div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
</div>
-
- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -202,6 +237,7 @@
, { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
, { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180, hide: true}
, { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125, hide: true }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115 }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
@@ -216,9 +252,6 @@
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125, hide: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125, hide: true }
- , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125 }
- , { field: '浠撳簱', title: '浠撳簱', width: 125 }
, { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
, { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', width: 125, hide: true }
, { field: '浠撲綅', title: '浠撲綅', width: 125, hide: true }
@@ -275,26 +308,56 @@
}
//蹇�熻繃婊�
function get_FastQuery(table, option) {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ //var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HDept) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 浠撳簱 like '%" + HWhName + "%'";
+ }
+ //if (HSupName) {
+ // sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
+ //}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillList.html"
index e4cfde0..8c67f60 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillList.html"
@@ -31,11 +31,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span>鏇村</span>
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
</div>
- </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -54,18 +54,55 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--<div class="layui-colla-content">
- <div class="layui-inline">
+
+ <div class="layui-colla-content">
<div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
+ </div>
</div>
</div>
-
- </div>-->
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -202,6 +239,7 @@
, { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
, { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180, hide: true }
, { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125, hide: true }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115 }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
@@ -275,26 +313,57 @@
}
//蹇�熻繃婊�
function get_FastQuery(table, option) {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ //var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HDept) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 浠撳簱 like '%" + HWhName + "%'";
+ }
+ //if (HSupName) {
+ // sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
+ //}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.html"
index 8232491..b069959 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.html"
@@ -39,14 +39,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐘舵��</label>
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <select name="HStatus" lay-filter="HStatus" style="width:190px;">
- <option value="-1" selected="selected">鍏ㄩ儴</option>
- <option value="0">鏈鏍�</option>
- <option value="1">宸插鏍�</option>
- <option value="2">宸插叧闂�</option>
- </select>
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -61,6 +56,12 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -73,34 +74,52 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬淇℃伅</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
</div>
</div>
- </div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- </div>
- </script>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </div>
</form>
</div>
</div>
@@ -207,6 +226,7 @@
, { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
, { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 }
, { field: '淇濈鍛樺悕绉�', title: '淇濈鍛樺悕绉�', width: 200 }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 200 }
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
@@ -514,40 +534,43 @@
}
function get_FastQuery(table, option) {
- var HStatus = $("select[name='HStatus']").val();//鐘舵��
- var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
- var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
- if (HStatus) {
- switch (HStatus) {
- case '-1': //鍏ㄩ儴
- sWhere += "";
- break;
- case '0': //鏈鏍�
- sWhere += " and 瀹℃牳浜�=''";
- break;
- case '1': //宸插鏍�
- sWhere += " and 瀹℃牳浜�<>''";
- break;
- case '2': //宸插叧闂�
- sWhere += " and 鍏抽棴浜�<>''";
- default:
-
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
- }
- if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
- }
- if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
- }
- if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
- }
- if (HDept) {
- sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HDept + "%'";
- }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HDept) {
+ sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HDept + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 浠撳簱鍚嶇О like '%" + HWhName + "%'";
+ }
+ if (HSupName) {
+ sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
+ }
var index = layer.load(0);
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -555,11 +578,15 @@
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $('#HStatus').find("option[value='-1']").attr("selected", true);
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HBillNo").val("");
- $("#HDept").val("");
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBillList.html"
index b581995..19bbaa5 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBillList.html"
@@ -38,13 +38,13 @@
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate">
+ <input type="date" class="layui-input" id="HBeginDate">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate1">
+ <input type="date" class="layui-input" id="HEndDate">
</div>
</div>
<div class="layui-inline">
@@ -53,16 +53,12 @@
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
<div class="layui-input-block">
- <select name="HBillType" id="HBillType">
- <option value="">鎵�鏈�</option>
- <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
- <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
- </select>
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
</div>
- </div>-->
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -72,6 +68,36 @@
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
</div>
</div>
</div>
@@ -180,9 +206,15 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
});
@@ -232,6 +264,7 @@
, { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
, { field: '鍙戣揣鍛樹唬鐮�', title: '鍙戣揣鍛樹唬鐮�', width: 200 }
, { field: '鍙戣揣鍛樺悕绉�', title: '鍙戣揣鍛樺悕绉�', width: 200 }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115 }
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
@@ -310,19 +343,43 @@
// 蹇�熻繃婊�
function get_FastQuery() {
- var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
-
+ if (HDept) {
+ sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HDept + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 浠撳簱鍚嶇О like '%" + HWhName + "%'";
+ }
+ if (HSupName) {
+ sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
+ }
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
index 1e687c3..7b41bce 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
@@ -31,11 +31,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
+ <div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -54,18 +54,54 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--<div class="layui-colla-content">
+ <div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
</div>
-
- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -180,6 +216,7 @@
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 }
//, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
, { field: '鏀舵枡浠撳簱ID', title: '鏀舵枡浠撳簱ID', width: 200, hide: true }
, { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', width: 125 }
, { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 125 }
@@ -402,17 +439,42 @@
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HDept) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 浠撳簱 like '%" + HWhName + "%'";
+ }
+ if (HSupName) {
+ sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -420,9 +482,15 @@
//#endregion
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
+ $("#HWhName").val("");
+ $("#HSupName").val("");
+ $("#HStockOrgName").val("");
sWhere = "";
get_Display(sWhere);
}
--
Gitblit v1.9.1