From 6029d9cca9e132c4ba7a64cefe3db5eeaaecdf74 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 十一月 2025 09:24:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/仓存管理/装箱单/Sc_PackUnionBillMain_Packing.html | 75 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 20 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
index 7886cdd..0ad2055 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
@@ -96,11 +96,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
- <>
+ <>
</option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
@@ -130,11 +130,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
- <>
+ <>
</option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
@@ -164,11 +164,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <= </option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
- <>
+ <>
</option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
@@ -401,6 +401,7 @@
$("#HBeginDate").val(util.toDateString(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd"));
//鏌ヨ
+ get_FastQuery()
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -511,14 +512,14 @@
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+ //DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
ins = table.render(option);
layer.close(ajaxLoad);
- if ($("#ColName option").length < 1) {
- ColFilter();
- get_DefaultModule();//鍔犺浇鏂规
- }
+ //if ($("#ColName option").length < 1) {
+ // ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
+ //}
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -553,6 +554,15 @@
//鍒嗛〉
function get_DisplayPage(sWhere) {
+ if (sessionStorage["HAutoLogin"] == "1") {
+ sWhere += " and HSupID = '" + sessionStorage["HUserName"] + "'";
+ } else {
+ var ModRightNameCheck = "Cg_Manager";
+ if (!set_ModCheck(ModRightNameCheck)) {
+ sWhere += " and HSupID = '" + sessionStorage["HSupID"] + "'";
+ }
+ }
+
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -603,12 +613,14 @@
laypage.render(optionPage);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+ ins = table.render(option);
if ($("#ColName option").length < 1) {
ColFilter();
- get_DefaultModule();//鍔犺浇鏂规
+ // get_DefaultModule();//鍔犺浇鏂规
}
- ins = table.render(option);
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -735,12 +747,13 @@
function set_ClearQuery() {
$("#HBillNo").val("");
$('#HStatus').find("option[value='-1']").attr("selected", true);
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(util.toDateString(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd"));
$("#HOrgID").val(sessionStorage["OrganizationID"]);
$("#ColContent").val("");
$("#ColName").val("0");
- $("#Comparator").val("0"); $("#ColContent2").val("");
+ $("#Comparator").val("0");
+ $("#ColContent2").val("");
$("#ColName2").val("0");
$("#Comparator2").val("0");
$("#ColContent1").val("");
@@ -868,6 +881,28 @@
}
//#endregion
+ //#region 鏉冮檺鍒ゅ畾
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ //layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
+ //#endregion
+
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
@@ -906,7 +941,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
--
Gitblit v1.9.1