From 68226c5ac39b6154a6956f627b45e8663f9982fa Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 14 十月 2022 09:54:37 +0800
Subject: [PATCH] 表头增加 物料编码、当前工序 的筛选条件（进站、出站、委外发出、委外接收）
---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 36 +++++++++++++++--
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 29 ++++++++++++++
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBillList.html | 24 ++++++++++++
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillList.html | 24 ++++++++++++
4 files changed, 107 insertions(+), 6 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
index 11b2632..c075dae 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
@@ -79,6 +79,20 @@
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
+ <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="HNumber" id="HNumber">
+ </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="HName" id="HName">
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -214,6 +228,8 @@
$("#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"));
+ $("#HNumber").val("");
+ $("#HName").val("");
}
@@ -223,9 +239,17 @@
var HBillNo = $("#HBillNo").val();
var HICMOBillNo = $("#HICMOBillNo").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HNumber = $("#HNumber").val(); //浜у搧浠ｇ爜 鍗崇墿鏂欑紪鐮�
+ var HName = $("#HName").val(); //褰撳墠宸ュ簭
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HNumber) {
+ sWhere += " and 浜у搧浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 宸ュ簭 like '%" + HName + "%'";
+ }
if (HStatus) {
switch (HStatus) {
case '-1': //鍏ㄩ儴
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
index 592cc3f..4ef9168 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
@@ -79,6 +79,20 @@
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
+ <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="HNumber" id="HNumber">
+ </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="HName" id="HName">
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -221,6 +235,8 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HProcExchBillNo").val("");
+ $("#HNumber").val("");
+ $("#HName").val("");
}
//蹇�熻繃婊�
@@ -229,9 +245,17 @@
var HBillNo = $("#HBillNo").val();
var HICMOBillNo = $("#HICMOBillNo").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HNumber = $("#HNumber").val(); //浜у搧浠ｇ爜 鍗崇墿鏂欑紪鐮�
+ var HName = $("#HName").val(); //褰撳墠宸ュ簭
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HNumber) {
+ sWhere += " and 浜у搧浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 宸ュ簭 like '%" + HName + "%'";
+ }
if (HStatus) {
switch (HStatus) {
case '-1': //鍏ㄩ儴
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 4072d8b..ee5d96b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -81,12 +81,26 @@
</div>
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px;">
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
+ <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="HNumber" id="HNumber">
+ </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="HName" id="HName">
+ </div>
+ </div>
<div class="layui-inline">
<div class="layui-input-block">
<input type="checkbox" name="checkHWasterQty" id="checkHWasterQty" lay-skin="primary" lay-filter="checkHWasterQty" title="鎶ュ簾鏁伴噺涓嶄负0">
</div>
</div>
+ </div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -575,7 +589,7 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HWorkBillNo").val();
+ $("#HWorkBillNo").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"));
@@ -583,7 +597,10 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#HNumber").val("");
+ $("#HName").val("");
form.render('select');
+ sWhere = "";
}
//蹇�熻繃婊�
@@ -596,8 +613,10 @@
var HProcExchBillNo = $("#HProcExchBillNo").val();
var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//澶嶉�夋
var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
+ var Comparator = $("#Comparator").val();
var ColContent = $("#ColContent").val();
+ var HNumber = $("#HNumber").val(); //浜у搧浠ｇ爜 鍗崇墿鏂欑紪鐮�
+ var HName = $("#HName").val(); //褰撳墠宸ュ簭
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -642,8 +661,12 @@
if (checkHWasterQty) {
sWhere += " and 鎶ュ簾鏁伴噺>0 ";
}
-
-
+ if (HNumber) {
+ sWhere += " and 浜у搧浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 褰撳墠宸ュ簭 like '%" + HName + "%'";
+ }
if (HStatus) {
switch (HStatus) {
@@ -736,6 +759,9 @@
DisPlay_HideColumn();
layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 10287ff..9777077 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -84,6 +84,20 @@
</div>
<div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
<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="HNumber" id="HNumber">
+ </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="HName" id="HName">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
+ <div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
@@ -416,6 +430,9 @@
DisPlay_HideColumn();
layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
@@ -440,6 +457,8 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var HNumber = $("#HNumber").val(); //浜у搧浠ｇ爜 鍗崇墿鏂欑紪鐮�
+ var HName = $("#HName").val(); //褰撳墠宸ュ簭
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -478,6 +497,12 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HNumber) {
+ sWhere += " and 浜у搧浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 褰撳墠宸ュ簭 like '%" + HName + "%'";
+ }
if (HStatus) {
switch (HStatus) {
case '-1': //鍏ㄩ儴
@@ -500,7 +525,7 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HWorkBillNo").val();
+ $("#HWorkBillNo").val("");
$("#HBillNo").val("");
$("#宸ュ簭娴佽浆鍗″彿").val("");
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -508,6 +533,8 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#HNumber").val("");
+ $("#HName").val("");
form.render('select');
sWhere = "";
}
--
Gitblit v1.9.1