From 752e8fd530e3aae8cfa8e86136f51dc50b4b64b6 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 21 四月 2026 20:23:24 +0800
Subject: [PATCH] 1
---
WebTM/WebTM.csproj.user | 2 +-
WebTM/views/系统管理/用户管理/Gy_UserProcess.html | 12 +++++++++---
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill.html | 2 ++
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 8bc061c..9cd5e70 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -8,7 +8,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯LMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\WorkBench\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/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
index 10b6c60..5ac1bba 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
@@ -538,6 +538,8 @@
Pub_Close(2);
} else if (OperationType == 2) {
Pub_Close(1);
+ } else {
+ Pub_Close(1);
}
})
//#endregion
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/Gy_UserProcess.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/Gy_UserProcess.html"
index fff1da7..492ba20 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/Gy_UserProcess.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/Gy_UserProcess.html"
@@ -493,12 +493,18 @@
}
//#region 鍒ゆ柇鏁版嵁鏁扮粍涓殑鍊兼槸鍚︾浉鍚�
function isAllEqual(list) {
- var s = list.join(",") + ",";
for (var i = 0; i < list.length; i++) {
- if (s.replace(list[i] + ",", "").indexOf(list[i] + ",") > -1) {
- return true;
+ var count = 0;
+ for (var j = 0; j < list.length; j++) {
+ if (list[i] === list[j]) {
+ count++;
+ }
+ if (count >= 2) {
+ return true; // 鎵惧埌閲嶅
+ }
}
}
+ return false;
}
//#region 闈炵┖楠岃瘉
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
--
Gitblit v1.9.1