From 24a8e8badf4cde0a91695fe2d0b7e9096bb91b10 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 07 五月 2025 13:46:24 +0800
Subject: [PATCH] 基础资料部门列表：由其它页面进行打开时，增加条件过滤，根据传递的参数决定是否增加对 车间标记 的过滤 报工：欠料运算、提料运算选择车间时递入参数只显示车间标记为'Y'的部门
---
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 5 +++--
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 8 ++++----
WebTM/views/生产管理/宝工排产/JIT_PickUpCalculate_BaoGong.html | 2 +-
WebTM/views/生产管理/欠料运算/JIT_MaterialLevelShorAnalysis.html | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index f86ee4b..fa5783b 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -3465,7 +3465,7 @@
<publishTime>07/19/2021 10:10:46</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">
- <publishTime>05/07/2025 11:06:44</publishTime>
+ <publishTime>05/07/2025 12:07:40</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department_Edit.html">
<publishTime>04/29/2021 09:11:59</publishTime>
@@ -5447,7 +5447,7 @@
<publishTime>04/16/2025 10:32:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/瀹濆伐鎺掍骇/JIT_DayPlanPlatForm.html">
- <publishTime>04/28/2025 14:17:20</publishTime>
+ <publishTime>05/07/2025 12:01:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/瀹濆伐鎺掍骇/JIT_LockRequestBill.html">
<publishTime>02/20/2025 14:35:50</publishTime>
@@ -5459,7 +5459,7 @@
<publishTime>04/18/2025 13:44:54</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/瀹濆伐鎺掍骇/JIT_PickUpCalculate_BaoGong.html">
- <publishTime>03/26/2025 12:54:19</publishTime>
+ <publishTime>05/07/2025 12:10:32</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/瀹濆伐鎺掍骇/JIT_UnLockRequestBill.html">
<publishTime>02/20/2025 16:29:20</publishTime>
@@ -5687,7 +5687,7 @@
<publishTime>11/11/2024 15:08:01</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/娆犳枡杩愮畻/JIT_MaterialLevelShorAnalysis.html">
- <publishTime>03/18/2025 09:33:56</publishTime>
+ <publishTime>05/07/2025 12:04:36</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/娆犳枡杩愮畻/JIT_MaterialLevelShorAnalysisDetailReport.html">
<publishTime>04/08/2025 10:03:42</publishTime>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 4132e21..db1c0dc 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -1144,10 +1144,11 @@
if (openType != "undefined" && HOrgName != "undefined") {
if (openType == 1) {
- addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� !='' and 杞﹂棿鏍囪 = 'Y' " ;
+ /*addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� !='' and 杞﹂棿鏍囪 = 'Y' " ;*/
+ addSWhere = " and 绂佺敤鏍囪 = '' and 杞﹂棿鏍囪 = 'Y' ";
Organization = HOrgName.toString();
} else {
- addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� !=''";
+ addSWhere = " and 绂佺敤鏍囪 = '' ";
Organization = HOrgName.toString();
}
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_PickUpCalculate_BaoGong.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_PickUpCalculate_BaoGong.html"
index 95f28ee..b7e49e2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_PickUpCalculate_BaoGong.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_PickUpCalculate_BaoGong.html"
@@ -107,7 +107,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=1&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysis.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysis.html"
index 209f115..6d0f586 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysis.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysis.html"
@@ -252,7 +252,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=1&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
--
Gitblit v1.9.1