基础资料部门列表：由其它页面进行打开时，增加条件过滤，根据传递的参数决定是否增加对 车间标记 的过滤 报工：欠料运算、提料运算选择车间时递入参数只显示...

duhe

2025-05-07 24a8e8badf4cde0a91695fe2d0b7e9096bb91b10

基础资料部门列表：由其它页面进行打开时，增加条件过滤，根据传递的参数决定是否增加对 车间标记 的过滤
报工：欠料运算、提料运算选择车间时递入参数只显示车间标记为'Y'的部门

 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>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/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();
                    }
                }

 WebTM/views/Éú²ú¹ÜÀí/±¦¹¤ÅŲú/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]  //获取弹框页面

 WebTM/views/Éú²ú¹ÜÀí/Ç·ÁÏÔËËã/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]  //获取弹框页面