From 701bfeb132558a0584d3f3ae56bccf97002d223c Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 17 五月 2022 10:47:05 +0800
Subject: [PATCH] nothing
---
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 49 ++++++++++++++++++++++++++++++++++++++++---------
WebTM/views/生产管理/生产装箱单/QK_PackingBill.html | 11 ++---------
2 files changed, 42 insertions(+), 18 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index f5be64b..893e3eb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -70,10 +70,31 @@
<label class="layui-form-label">鐢熶骇杞﹂棿</label>
<div class="layui-input-block">
<select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
-
+
<!--鍔ㄦ�佹覆鏌撹溅闂�-->
</select>
-
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">涓氬姟鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
+ <option value="0" selected>鍏ㄩ儴</option>
+ <option value="璁″垝">璁″垝</option>
+ <option value="璁″垝纭">璁″垝纭</option>
+ <option value="涓嬭揪">涓嬭揪</option>
+ <option value="寮�宸�">寮�宸�</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="HBillType" id="HBillType">
</div>
</div>
<div class="layui-inline">
@@ -224,13 +245,13 @@
, { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120, hide: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170, hide: true }
- , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120 }
- , { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 120 }
- , { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true, width: 120 }
- , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true, width: 120 }
- , { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 120 }
- , { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 120 }
- , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', sort: true, width: 120 }
+ , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 200 }
+ , { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 200 }
+ , { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true, width: 200 }
+ , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true, width: 150 }
+ , { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 150 }
+ , { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 150 }
+ , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', sort: true, width: 150 }
, { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', sort: true, width: 120, hide: true }
, { field: 'HDeptID', title: 'HDeptID', hide: true}
@@ -324,6 +345,8 @@
var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
var HMaterName = $("#HMaterName").val();//鍗曟嵁鍙�
var HDeptName = $("#HDeptName").val();//鍗曟嵁鍙�
+ var HStatus = $("#HStatus").val();//鍗曟嵁鍙�
+ var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
if (HDate) {
sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
}
@@ -342,6 +365,12 @@
if (HDeptName && HDeptName!=0) {
sWhere += " and HDeptID = " + HDeptName ;
}
+ if (HStatus && HStatus != 0) {
+ sWhere += " and 涓氬姟鐘舵�� like '%" + HStatus + "%'";
+ }
+ if (HBillType) {
+ sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HBillType + "%'";
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -355,6 +384,8 @@
$("#WorkCenter").val("");//鍗曟嵁鍙�
$("#HDeptName").val("");//鍗曟嵁鍙�
$("#HMaterName").val("");//鍗曟嵁鍙�
+ $("#HDeptName").val("");//鍗曟嵁鍙�
+ $("#HStatus").val("");//鍗曟嵁鍙�
$("#btnSearch").click();
sWhere = "";
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
index 5879c8c..8eba67b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
@@ -165,6 +165,7 @@
{ type: 'checkbox', fixed: 'left' }
, { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text', width: 100, hide: true }
, { field: 'HInterID', title: 'HInterID', edit: 'text', width: 100, hide: true }
+ , { field: 'HEntryID', title: 'HEntryID', edit: 'text', width: 100, hide: true }
, { field: 'HBillNo', title: 'HBillNo', edit: 'text', width: 100, hide: true }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
, { field: 'HMaterNumber', title: 'HMaterNumber', edit: 'text', width: 100, hide: true }
@@ -237,15 +238,7 @@
OpenTmp = "鍖呰鏂瑰紡鏉＄爜";
}
window.open("../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
- var url = "";
- switch (Type) {
- case "HGy_BarCodeBill": //HBarCodePrint
- url = "/Sc_BarCode/UpdateBarcodePrintQty"
- break;
- case "HPOInStockBill":
- url = "UpdatePOInStockBillPrintQty"
- break;
- }
+
}
else {
f_alert(data.Message);
--
Gitblit v1.9.1