From cfd87df1abd56e6100ed8e1be3df9a94f51e9849 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 26 十二月 2023 09:36:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/系统管理/用户管理/Gy_UserCustomer.html | 5 +++--
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 40 ++++++++++++++++++++--------------------
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 6c5aa21..a3b6bba 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -1482,7 +1482,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>12/15/2023 16:23:31</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/indexMenu.html">
<publishTime>12/15/2023 16:23:31</publishTime>
@@ -3285,7 +3285,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3375,7 +3375,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3543,10 +3543,10 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html">
- <publishTime>12/15/2023 16:23:31</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList_Web.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3579,10 +3579,10 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ICMOBillQualityStatus_TmpList.html">
- <publishTime>12/01/2023 15:22:04</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ICMOBillWorkQtyStatus_TmpList.html">
- <publishTime>12/01/2023 15:22:04</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3738,7 +3738,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇瀹屽伐鍗�/Sc_MESEndWorkBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3753,7 +3753,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_MESBeginWorkBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3762,13 +3762,13 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇瀹屽伐鍗�/Sc_MESEndWorkBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_MESBeginWorkBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3798,10 +3798,10 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
- <publishTime>12/15/2023 16:23:31</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
- <publishTime>12/15/2023 16:23:31</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">
<publishTime>12/15/2023 16:23:31</publishTime>
@@ -3828,7 +3828,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html">
- <publishTime>12/20/2023 10:55:06</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html">
<publishTime>07/24/2023 08:52:38</publishTime>
@@ -3951,7 +3951,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserCustomer.html">
- <publishTime>11/20/2023 15:33:27</publishTime>
+ <publishTime>12/25/2023 12:21:04</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserDept.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -4041,7 +4041,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpConkBookBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -4350,7 +4350,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpConkBookBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -4449,7 +4449,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯/BadQueryReport.html">
- <publishTime>11/28/2023 12:03:19</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_CollectionOfSingleProductDefects.html">
<publishTime>12/13/2023 00:09:29</publishTime>
@@ -4464,7 +4464,7 @@
<publishTime>12/20/2023 10:55:06</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯/RetrospectiveQueryReport.html">
- <publishTime>11/28/2023 12:03:19</publishTime>
+ <publishTime>12/25/2023 09:35:23</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯/Sc_SourceLineRepairBillList.html">
<publishTime>11/28/2023 12:03:19</publishTime>
@@ -5007,7 +5007,7 @@
<publishTime>11/30/2023 11:42:53</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞��璐у崟/Add_Edit_Kf_ICStockBillMainList.html">
- <publishTime>12/20/2023 11:38:42</publishTime>
+ <publishTime>12/21/2023 15:03:47</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">
<publishTime>11/03/2023 21:45:51</publishTime>
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_UserCustomer.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_UserCustomer.html"
index 0e0c929..2079300 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_UserCustomer.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_UserCustomer.html"
@@ -185,7 +185,7 @@
$.ajax({
url: GetWEBURL() + "/Xt_User/CustomerPlaylist",
type: "GET",
- data: { "HUserID": checkStatus.data[0].HNumber },
+ data: { "HUserID": checkStatus.data[0].HNumber, "CurUserName": sessionStorage["HUserName"] },
success: function (data) {
if (data.data != null && data.data != "") {
option.data = data.data;
@@ -194,6 +194,7 @@
else {
table.reload("mainTable", {});
table.reload('mainTable', { data: [] });
+ layer.alert(data.Message);
}
}
@@ -305,7 +306,7 @@
return false;
}
- var sMainSub = sSubStr + ';' + UserID
+ var sMainSub = sSubStr + ';' + UserID + ';' + sessionStorage["HUserName"];
$.ajax(
{
type: "POST",
--
Gitblit v1.9.1