From 7a0051c050e486a9f9128f073e9819333413de1b Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 03 六月 2025 15:12:35 +0800
Subject: [PATCH] 器具主档：编辑页面 部门 改为 只能选择 已审核且未禁用的 数据。
---
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 2 +-
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 4 ++--
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index e4c5520..8c2e79d 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -3471,7 +3471,7 @@
<publishTime>07/19/2021 10:10:46</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">
- <publishTime>05/15/2025 14:44:59</publishTime>
+ <publishTime>06/03/2025 15:05:41</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department_Edit.html">
<publishTime>04/29/2021 09:11:59</publishTime>
@@ -5149,7 +5149,7 @@
<publishTime>07/19/2021 10:10:46</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
- <publishTime>06/03/2025 14:59:09</publishTime>
+ <publishTime>06/03/2025 15:11:10</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
<publishTime>06/03/2025 14:03:10</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 068e7f0..f2d52c9 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"
@@ -1203,7 +1203,7 @@
addSWhere = " and 绂佺敤鏍囪 = '' and 杞﹂棿鏍囪 = 'Y' ";
Organization = HOrgName.toString();
} else {
- addSWhere = " and 绂佺敤鏍囪 = '' ";
+ addSWhere = " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') <> '' ";
Organization = HOrgName.toString();
}
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index edfae55..ac3a4ec 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -812,6 +812,8 @@
//閮ㄩ棬
form.on('submit(btnHDeptList)', function () {
+ var HOrgName = sessionStorage["Organization"];
+
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -821,7 +823,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + HOrgName, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
--
Gitblit v1.9.1