From 1d8fb82464f414a42776d379e6898387b17c6179 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期四, 19 三月 2026 13:40:05 +0800
Subject: [PATCH] 1
---
WebTM/views/模治具管理/器具点检规程单/Sc_MouldDotCheckRuleBillEdit.html | 4 ++--
WebTM/WebTM.csproj.user | 4 ++--
WebTM/views/系统管理/用户管理/Xt_UserList.html | 5 ++++-
WebTM/views/成本管理/期初在产品表/Gy_WIPBal_Excel.html | 3 ++-
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 2 +-
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_WorkStationList.html | 8 ++++----
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 21 +++++----------------
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillSync.html | 2 +-
8 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 600ddb5..48a262b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -6,9 +6,9 @@
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>D:\鏅轰簯LMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
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/Add_Edit_Gy_WorkStationList.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/Add_Edit_Gy_WorkStationList.html"
index 77d6f6c..dd810ef 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/Add_Edit_Gy_WorkStationList.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/Add_Edit_Gy_WorkStationList.html"
@@ -381,8 +381,8 @@
//OptionData = checkStatus.data[0];
obj.update({
"HMaterID": checkStatus.data[0].HItemID
- , "HMaterName": checkStatus.data[0].鐗╂枡浠ｇ爜
- , "HMaterNumber": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "HMaterNumber": checkStatus.data[0].鐗╂枡浠ｇ爜
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -390,8 +390,8 @@
if (typeof (OptionData) != "undefined" && OptionData != [] && OptionData.length!=0) {
obj.update({
"HMaterID": OptionData.HItemID
- , "HMaterName": OptionData.鐗╂枡浠ｇ爜
- , "HMaterNumber": OptionData.鐗╂枡鍚嶇О
+ , "HMaterName": OptionData.鐗╂枡鍚嶇О
+ , "HMaterNumber": OptionData.鐗╂枡浠ｇ爜
})
OptionData = [];
}
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html"
index 0607335..7df01e7 100644
--- "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html"
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html"
@@ -225,7 +225,8 @@
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 120 }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 120 }
, { field: '鏈熷垵閲戦', title: '鏈熷垵閲戦', width: 120}
- , { field: '鏈熷垵鏁伴噺', title: '鏈熷垵鏁伴噺', width: 120}
+ , { field: '鏈熷垵鏁伴噺', title: '鏈熷垵鏁伴噺', width: 120 }
+ , { field: '鎷兼澘鏁�', title: '鎷兼澘鏁�', width: 120 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
};
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
index 068bdf3..ab09e38 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
@@ -587,7 +587,7 @@
id: 'mainTable'
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , page: false
+ , limit: 50
, totalRow: true
, cellMinWidth: 120
, height: 500
@@ -893,7 +893,7 @@
HDotCheckItem: checkStatus.data[i].鐐规椤圭洰鍚嶇О,
HDotCheckItemClassID: checkStatus.data[i].HDotCheckItemClassID,
HDotCheckItemClassName: checkStatus.data[i].鐐规椤圭洰鍒嗙被鍚嶇О,
-
+ HStdDotCheckResult: "OK"
});
}
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_MouldFileList.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_MouldFileList.html"
index 7f3a22d..3b90407 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_MouldFileList.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_MouldFileList.html"
@@ -607,27 +607,16 @@
case 'Int64':
case 'double':
case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
}
}
}
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , height: 'full-50'
- , page: false //寮�鍚垎椤�
- , limit: 50
- , limits: [50, 500, 2000, 5000]
- , cols: [col]
- , data: data1.data
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- };
+
+ option.cols = [col];
+ option.data = data1.data;
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
laypage.render(optionPage);
//鍒楄缃�
@@ -1291,7 +1280,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var addSWhere = "";
if (typeof(openType) != "undefined") {
- addSWhere = " and 浣滃簾浜� = '' and 鍏抽棴浜� = '' and 瀹℃牳浜� <> '' and 绂佺敤鏍囪 !='Y'";
+ addSWhere = " and 浣滃簾浜� = '' and 鍏抽棴浜� = '' and 瀹℃牳浜� <> ''";
}
return addSWhere;
}
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/Sc_Add_MouldDotCheckBillList.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/Sc_Add_MouldDotCheckBillList.html"
index 53970f0..add487c 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/Sc_Add_MouldDotCheckBillList.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/Sc_Add_MouldDotCheckBillList.html"
@@ -969,7 +969,7 @@
id: 'mainTable'
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , page: false
+ , limit: 50
, totalRow: true
, cellMinWidth: 120
, height: 500
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
index 651914f..4384612 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
@@ -771,7 +771,10 @@
success: function (result) {
if (result.count == 1) {
if (result.data[0].sWhere == "1") {
- res = " and 瀵瑰簲CLOUD缁勭粐 = '" + $("#HUSEORGID").val() + "'";
+ if ($("#HUSEORGID").val() != "") {
+ res = " and 瀵瑰簲CLOUD缁勭粐 = '" + $("#HUSEORGID").val() + "'";
+ }
+
} else {
res = result.data[0].sWhere;
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
index 68308a2..f12a593 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
@@ -235,7 +235,7 @@
set_ClearQuery();
get_FastQuery();
//鍒濆鍖栬嚜鍔ㄥ悓姝ヤ竴娆�
- get_InSync_Batch2(option.data);
+ //get_InSync_Batch2(option.data);
}
--
Gitblit v1.9.1