From f76f7425e575b8e4ebc63a71635c1221fe265c12 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 26 一月 2022 16:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html | 58 ++++++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 32 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 37d99ac..86c54fd 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"
@@ -35,6 +35,18 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">绠卞彿鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="BoxBarCode" 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" id="BarCode" style="width:190px;">
+ </div>
+ </div>
+ <!--<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input" id="HDate" style="width:190px;">
@@ -45,31 +57,13 @@
<div class="layui-input-block">
<input type="date" class="layui-input" id="HDate1" 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" id="HDepartName" 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>
</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">
- <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" 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" id="HMaterName" style="width:190px;">
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�</label>
<div class="layui-input-block">
@@ -198,8 +192,8 @@
resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
//鍒濆鏌ヨ
//get_Display(sWhere);
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(new Date()), "yyyy-MM-dd"));
get_FastQuery();
}
@@ -314,8 +308,8 @@
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
- var HDepartName = $("#HDepartName").val();
- var HMaterNumber = $("#HMaterNumber").val();
+ var BoxBarCode = $("#BoxBarCode").val();
+ var BarCode = $("#BarCode").val();
var HMaterName = $("#HMaterName").val();
var HMakerMan = $("#HMakerMan").val();
@@ -328,11 +322,11 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
- if (HDepartName) {
- sWhere += " and 閮ㄩ棬 like '%" + HDepartName + "%'";
+ if (BoxBarCode) {
+ sWhere += " and 绠卞彿鏉″舰鐮� like '%" + BoxBarCode + "%'";
}
- if (HMaterNumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ if (BarCode) {
+ sWhere += " and 鏉＄爜 like '%" + BarCode + "%'";
}
if (HMaterName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
@@ -345,11 +339,11 @@
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(new Date()), "yyyy-MM-dd"));
$("#HBillNo").val("");
- $("#HDepartName").val("");
- $("#HMaterNumber").val("");
+ $("#BoxBarCode").val("");
+ $("#BarCode").val("");
$("#HMaterName").val("");
$("#HMakerMan").val("");
sWhere = " ";
--
Gitblit v1.9.1