From 69f288cfb895577687f3ff2facf722cf4658c3d0 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 16 一月 2024 10:06:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/报表分析/Sc_ProcExchangeNoInReport.html | 70 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 30 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcExchangeNoInReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcExchangeNoInReport.html"
index 653ac22..e130e44 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcExchangeNoInReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcExchangeNoInReport.html"
@@ -33,7 +33,7 @@
<span>鏇村</span>
</div>
</div>
- <div class="layui-form layui-inline" style="position:relative;top:10px;">
+ <div class="layui-form layui-inline" style="position:relative;top:10px;left:-50px;">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-form-item layui-inline">
<div class="layui-inline">
@@ -42,11 +42,19 @@
</div>
</div>
</div>
- <div class="layui-form-item layui-inline">
+ <div class="layui-form-item layui-inline" style="position:relative;left:-25px;">
<div class="layui-inline">
- <label class="layui-form-label">-</label>
+ <label class="layui-form-label" style="width:5px;">-</label>
<div class="layui-input-inline">
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item layui-inline" style="margin-left: -45px; width: 270px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;">娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcBillNo" id="HProcBillNo">
</div>
</div>
</div>
@@ -54,7 +62,25 @@
<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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">閲嶇疆</button>
+ <div class="layui-form" style="position:relative;top:10px;">
+ <div class="layui-form-item layui-inline" style="margin-left: 20px; width: 270px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item layui-inline" style="margin-left:-45px;width:270px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ </div>
+ </div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<!--鍏朵粬鏉′欢-->
@@ -62,24 +88,6 @@
<label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗″彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcBillNo" id="HProcBillNo">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProductName" id="HProductName">
</div>
</div>
<div class="layui-inline">
@@ -225,7 +233,7 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨椂闂�
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));
//鍔犺浇鏁版嵁鍒扮綉鏍�
@@ -255,7 +263,7 @@
url: GetWEBURL() + "/MaterOutEntryReport/Sc_ProcExchangeNoInReport",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "HBeginDate": $("#HBeginDate").val(), "HEndDate": $("#HEndDate").val()},
+ data: { "sWhere": sWhere, "HBeginDate": $("#HBeginDate").val(), "HEndDate": $("#HEndDate").val(), "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -298,6 +306,8 @@
, data: data1.data
};
table.render(option);
+ } else {
+ layer.alert(data1.count + data1.Message, { icon: 5 })
}
},
error: function (err) {
@@ -323,27 +333,27 @@
var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
- sWhere = " and 鏃ユ湡 between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
+ //sWhere = " and 鏃ユ湡 between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
if (HBillNo != "") {
- sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HBillNo + "%' ";
+ sWhere += " and 鐢熶骇璁㈠崟鍙� like ''%" + HBillNo + "%'' ";
}
if (HProcBillNo != "") {
- sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcBillNo + "%' ";
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like ''%" + HProcBillNo + "%'' ";
}
if (HMaterNumber != "") {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%' ";
+ sWhere += " and 鐗╂枡浠ｇ爜 like ''%" + HMaterNumber + "%'' ";
}
if (HProductName != "") {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + HProductName + "%' ";
+ sWhere += " and 鐗╂枡鍚嶇О like ''%" + HProductName + "%'' ";
}
if (HProductModel != "") {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HProductModel + "%' ";
+ sWhere += " and 瑙勬牸鍨嬪彿 like ''%" + HProductModel + "%'' ";
}
//浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
--
Gitblit v1.9.1