From 671b5af2589d1b1a0278ea2684d99e396f5aae76 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 13 十月 2023 11:11:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/PublicPage/HSourceReportHtml.html | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 112 insertions(+), 5 deletions(-)
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 698a19b..f5b786c 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -35,9 +35,24 @@
</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="PartNumber" id="PartNumber" style="width:190px;">
+ <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">
+ <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="HProcExchBillNo" id="HProcExchBillNo" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -55,6 +70,14 @@
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="PartNumber" id="PartNumber" style="width:190px;">
+ </div>
+ </div>
+
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -117,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 = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
@@ -143,6 +166,7 @@
var HModName = "";
var option = [];
var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -158,6 +182,29 @@
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
+
+ //鑾峰彇閮ㄩ棬鍒�
+ var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴閮ㄩ棬</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ data: { "HOrgID": HOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ if (i == 0)
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ else
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+
+ }
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -230,6 +277,19 @@
case '濮斿璁㈠崟':
HModName = "WW_EntrustOrderBill_1601";
break;
+ case '鐢熶骇鍏ュ簱鍗�':
+ $("#HProcExchBillNoHidden").show();
+ HModName = "ProductInBill_1202";
+ break;
+ case '閲囪喘鍏ュ簱':
+ HModName = "POStockInBill_1201";
+ break;
+ case '閿�鍞��璐�':
+ HModName = "SellOutBackBill_1247";
+ break;
+ case '鐢熶骇閫�鏂�':
+ HModName = "MateOutBackBill_1244";
+ break;
}
//鍒濆鏌ヨ
get_Display(sWhere, HSouceBillType);
@@ -245,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) {
@@ -323,6 +383,8 @@
var HBillNo = $("#HBillNo").val();//鍗曟嵁缂栧彿
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();
@@ -347,7 +409,7 @@
}
sWhere += " and " + ColName + " " + com;
}
-
+
switch (HSouceBillType) {
case '鐢熶骇璁㈠崟':
if (HBillNo) {
@@ -358,6 +420,9 @@
}
if (PartName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
}
return sWhere;
break;
@@ -371,6 +436,9 @@
if (PartName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
}
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
return sWhere;
break;
case '閲囪喘璁㈠崟':
@@ -382,6 +450,9 @@
}
if (PartName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
}
return sWhere;
break;
@@ -395,6 +466,9 @@
if (PartName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
}
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
return sWhere;
break;
case '濮斿璁㈠崟':
@@ -406,6 +480,27 @@
}
if (PartName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
+ 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;
@@ -557,6 +652,7 @@
$("#HBillNo").val("");//鍗曟嵁鍙�
$("#PartNumber").val("");//鐗╂枡缂栫爜
$("#PartName").val("");//鐗╂枡鍚嶇О
+ $("#HDeptName").val("");//鍗曟嵁鍙�
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -580,6 +676,17 @@
}
//#endregion
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
//#endregion
//#endregion
--
Gitblit v1.9.1