From 171713c2333f93b4b5720859c41f29f8cbd0a984 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 03 六月 2025 14:55:27 +0800
Subject: [PATCH] 器具主档：编辑页面 器具分类 改为 只能选择 已审核且未禁用的 数据。
---
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 6 +++---
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 5 +++--
WebTM/views/基础资料/公用基础资料/Gy_MouldType.html | 26 ++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 7bf9cb4..abb9266 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -3536,7 +3536,7 @@
<publishTime>10/11/2024 11:32:36</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html">
- <publishTime>05/15/2025 14:44:58</publishTime>
+ <publishTime>06/03/2025 14:49:50</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html">
<publishTime>05/15/2025 14:44:58</publishTime>
@@ -3545,7 +3545,7 @@
<publishTime>10/11/2024 11:32:36</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
- <publishTime>05/30/2025 13:35:14</publishTime>
+ <publishTime>06/03/2025 14:53:16</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType_Excel.html">
<publishTime>10/11/2024 11:32:36</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:19:46</publishTime>
+ <publishTime>06/03/2025 14:37:18</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_MouldType.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_MouldType.html"
index 1ab3c0c..247ba80 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_MouldType.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_MouldType.html"
@@ -836,6 +836,7 @@
sWhere += sql;
}
+ addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -1158,6 +1159,31 @@
}
//#endregion
+ //#region 鑾峰彇鍙傛暟
+ 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
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+
+ if (typeof (openType) != "undefined") {
+ sWhere += " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') <> ''";
+ }
+ }
+ //#endregion
+
//淇敼鎸夐挳
function set_ShowBill() {
if (TagId != "") {
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 6f30bdd..1b263f3 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"
@@ -737,6 +737,7 @@
//妯″叿鍒嗙被
form.on('submit(btnHMouleList)', function () {
+ var HOrgID = $("#HUSEORGID").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -746,7 +747,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html?openType=2&HOrgID=' + HOrgID, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -2311,7 +2312,7 @@
}
function GetMouldTypeValue(obj) { //鍣ㄥ叿鍒嗙被
- $("#HMouleTypeName").val(obj[0].HName);
+ $("#HMouleTypeName").val(obj[0].鍣ㄥ叿鍒嗙被鍚嶇О);
$("#HMouleTypeID").val(obj[0].HItemID);
}
--
Gitblit v1.9.1