From f6bb53f6d9c33a306db4a0a9e0f5638020e6e099 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 03 六月 2025 14:25:21 +0800
Subject: [PATCH] 器具主档：编辑页面 对应erp物料 数据改为 已经审核且未禁用的数据，双击可返回
---
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 6 +++---
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 11 ++++++-----
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 13b9b26..7bf9cb4 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -3530,7 +3530,7 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/15/2025 14:44:58</publishTime>
+ <publishTime>06/03/2025 14:23:20</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material_Excel.html">
<publishTime>10/11/2024 11:32:36</publishTime>
@@ -5149,10 +5149,10 @@
<publishTime>07/19/2021 10:10:46</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
- <publishTime>06/03/2025 11:17:55</publishTime>
+ <publishTime>06/03/2025 14:19:46</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
- <publishTime>06/03/2025 14:01:55</publishTime>
+ <publishTime>06/03/2025 14:03:10</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">
<publishTime>06/13/2024 14:47:29</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_Material.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_Material.html"
index 4a99690..d265d83 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_Material.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_Material.html"
@@ -1469,7 +1469,7 @@
var HOrgID = params[params[1]];
var openType2 = params[params[2]];//涔斾竴浣跨敤鑷埗澶栬喘杩囨护
if (typeof (openType) != "undefined") {
- sWhere += " and 绂佺敤鏍囪 = ''";
+ sWhere += " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') <> ''";
if (openType2 == "POOrder") {
sWhere += " and 鐗╂枡灞炴��='澶栬喘' "
} else if (openType2 == "SeOrder") {
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 dd2272d..6f30bdd 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"
@@ -698,6 +698,7 @@
//瀵瑰簲Erp鐗╂枡
form.on('submit(btnHMaterList)', function () {
+ var HOrgID = $("#HUSEORGID").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -707,7 +708,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID , 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -2303,10 +2304,10 @@
return Result;
}
- function GetMaterValue(obj) { //鐗╂枡
- $("#HName").val(obj[0].鐗╂枡鍚嶇О);
- $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
- $("#HMaterID").val(obj[0].HItemID);
+ function GetGyMaterial(obj) { //鐗╂枡
+ $("#HName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
+ $("#HMaterID").val(obj.HItemID);
}
function GetMouldTypeValue(obj) { //鍣ㄥ叿鍒嗙被
--
Gitblit v1.9.1