From 4ece667df879a0e8179f641e8365932fe3d7ec65 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 29 十一月 2021 10:26:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 92 +++++++++++++++++++++++++++++++++------------
1 files changed, 67 insertions(+), 25 deletions(-)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 29d0730..6b61a7a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -59,24 +59,43 @@
<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-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="HBillNo" id="HBillNo" style="width:190px;">
+ <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-inline">
- <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label">涓氬姟鍛�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗忓悓鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HXTStatus" lay-filter="HXTStatus" style="width:190px;">
+ <option value="" selected>鍏ㄩ儴</option>
+ <option value="鏈‘璁�">鏈‘璁�</option>
+ <option value="宸茬‘璁�">宸茬‘璁�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍙嶉鐘舵��</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" 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="HMaterName" id="HMaterName" style="width:190px;">
</div>
</div>
</div>
@@ -324,13 +343,16 @@
//鍔犺浇缃戞牸
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 + "'";
+ 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',
@@ -917,7 +939,12 @@
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
- var HSupID = $("#HSupID").val(); //渚涘簲鍟嗕俊鎭�
+ var HEmpID = $("#HEmpID").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var HMaterName = $("#HMaterName").val();
+ var HXTStatus = $("select[name='HXTStatus']").val();
+ var HXTFKStatus = $("#HXTFKStatus").val();
+
if (HStatus) {
switch (HStatus) {
case '-1': //鍏ㄩ儴
@@ -944,8 +971,22 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
- if (HSupID) {
- sWhere += " and HSupID = '" + HSupID + "'";
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HMaterName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ }
+ if (HEmpID) {
+ sWhere += " and 涓氬姟鍛� like '%" + HEmpID + "%'";
+ }
+ if (HXTStatus) {
+ sWhere += " and 渚涘簲鍟嗗崗鍚岀姸鎬� like '%" + HXTStatus + "%'";
+
+ }
+ if (HXTFKStatus) {
+ sWhere += " and 鍙嶉鐘舵�� like '%" + HXTFKStatus + "%'";
+
}
var index = layer.load(0);
get_Display(sWhere);
@@ -958,8 +999,9 @@
$("#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("");
- $("#HSupName").val("");
- $("#HSupID").val("");
+ $("#HEmpID").val("");
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
sWhere = "";
get_Display(sWhere);
}
--
Gitblit v1.9.1