From 1f58a2af83ee4fbf4088e71b0f9f49a6adfaee6f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 21 十一月 2023 14:57:28 +0800
Subject: [PATCH] 单品过站完善 返修记录列表 合格记录报表 不良记录报表
---
WebTM/views/PublicPage/HSourceReportHtml.html | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 47c28e2..f5b786c 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -33,7 +33,7 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
@@ -44,11 +44,17 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width:190px;">
+ </div>
+ </div>-->
+ <div class="layui-inline" id="HProcExchBillNoHidden" style="display:none;">
+ <label class="layui-form-label">娴佽浆鍗″彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width:190px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="width:190px;">
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
@@ -134,7 +140,7 @@
var OperationType = 1;//鎿嶄綔绫诲瀷
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var linterid = params[params[1]];//婧愬崟id
+ var HOrgID = params[params[1]];//婧愬崟id
var HSouceBillType = decodeURI(params[params[2]]);//婧愬崟绫诲瀷
}
var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
@@ -161,10 +167,6 @@
var option = [];
var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var HDeptID = 0;
-
- var params = getUrlVars();
- var HDeptID = params[params[0]];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -186,6 +188,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ data: { "HOrgID": HOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
@@ -197,9 +200,6 @@
}
$("#HDeptName").append(HDeptName);
- if (!isNaN(HDeptID)) {
- $("#HDeptName").val(HDeptID);
- }
form.render('select');
}
layer.closeAll("loading");
@@ -277,7 +277,8 @@
case '濮斿璁㈠崟':
HModName = "WW_EntrustOrderBill_1601";
break;
- case '鐢熶骇鍏ュ簱':
+ case '鐢熶骇鍏ュ簱鍗�':
+ $("#HProcExchBillNoHidden").show();
HModName = "ProductInBill_1202";
break;
case '閲囪喘鍏ュ簱':
@@ -304,7 +305,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
type: "GET",
- data: { "page": 1, "limit": 50, "sWhere": sWhere, "HSouceBillType": HSouceBillType, "HOrgID": linterid },
+ data: { "page": 1, "limit": 50, "sWhere": sWhere, "HSouceBillType": HSouceBillType, "HOrgID": HOrgID },
async: false,
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data1) {
@@ -383,6 +384,7 @@
var PartNumber = $("#PartNumber").val();//鐗╂枡缂栫爜
var PartName = $("#PartName").val();//鐗╂枡鍚嶇О
var HDeptName = $("#HDeptName").val();//閮ㄩ棬
+ var HProcExchBillNo = $("#HProcExchBillNo").val();//娴佽浆鍗�
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -407,10 +409,7 @@
}
sWhere += " and " + ColName + " " + com;
}
- //浼犻�掔殑鍙傛暟涓嶄负NAN
- if (!isNaN(HDeptID) && HDeptName == 0) {
- HDeptName = HDeptID;
- }
+
switch (HSouceBillType) {
case '鐢熶骇璁㈠崟':
if (HBillNo) {
@@ -487,6 +486,24 @@
}
return sWhere;
break;
+ case '鐢熶骇鍏ュ簱鍗�':
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
+ if (HProcExchBillNo!="") {
+ sWhere += " and 娴佽浆鍗″彿 like '" + HProcExchBillNo + "%'";
+ }
+ return sWhere;
+ break;
case '閫�璐ч�氱煡鍗�':
return sWhere;
break;
--
Gitblit v1.9.1