From cf641f6f4bc5e4b4d0be42383d4251f28c4d3e46 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 19 一月 2026 16:11:40 +0800
Subject: [PATCH] 添康多车间排产；直接方案F7多选检验项目bug修复；小卫镭雕数据上传，提示成功图标修改
---
WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK.html | 130 ++++++++++++++++++++++++++++++++-----------
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 9 ++-
WebTM/views/车间管理/单品过站_小卫/Cj_SaveSNByICMO.html | 2
3 files changed, 103 insertions(+), 38 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK.html"
index 80adddb..6f6408d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK.html"
@@ -872,11 +872,15 @@
columns.push({ field: '璁″垝鏈畬鎴愭暟', title: '璁″垝鏈畬鎴愭暟', width: 150, filter: true });
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺', filter: true });
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
+
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID", filter: true });
+ columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150, sort: true, filter: true });
columns.push({ field: '瑕佽揣鏃ユ湡', title: '瑕佽揣鏃ユ湡', width: 150, templet: "<div>{{d.瑕佽揣鏃ユ湡 ==null ?'':layui.util.toDateString(d.瑕佽揣鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HDeliveryDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '寮�宸ユ棩鏈�', title: '寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
- columns.push({ field: '瀹屽伐鏃ユ湡', title: '瀹屽伐鏃ユ湡', width: 150, templet: "<div>{{d.瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
- columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
+ columns.push({ field: '寮�宸ユ棩鏈�', title: '寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '瀹屽伐鏃ユ湡', title: '瀹屽伐鏃ユ湡', width: 150, templet: "<div>{{d.瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+
+ //columns.push({ field: '寮�宸ユ棩鏈�', title: '寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
+ //columns.push({ field: '瀹屽伐鏃ユ湡', title: '瀹屽伐鏃ユ湡', width: 150, templet: "<div>{{d.瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150, sort: true, hide: true });
columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150, sort: true, hide: true });
@@ -887,28 +891,31 @@
for (var i = 0; i < HArrangeProductDayQty; i++) {
columns.push(dateColumns[i]);//0
}
-
+
columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150, sort: true, hide: true });
columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true, sort: true });
- columns.push({ field: '閿�鍞鍗曞鏍告棩鏈�', title: '閿�鍞鍗曞鏍告棩鏈�', width: 150, templet: "<div>{{d.閿�鍞鍗曞鏍告棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞鍗曞鏍告棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150, sort: true });
+ columns.push({ field: '鐢熶骇璧勬簮缂栫爜', title: '鐢熶骇璧勬簮缂栫爜', width: 150, sort: true });
+ columns.push({ field: '鐢熶骇杞﹂棿缂栫爜', title: '鐢熶骇杞﹂棿缂栫爜', width: 150, sort: true })
+ columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150, sort: true });
+ columns.push({ field: '缁勭粐缂栫爜', title: '缁勭粐缂栫爜', width: 150, sort: true });
columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150, sort: true });
- columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150, sort: true });
- columns.push({ field: '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', title: '婧愬崟璁㈠崟鍗曟嵁绫诲瀷', width: 150, sort: true });
- columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150, sort: true });
- columns.push({ field: '璁㈠崟浜よ揣鏈�', title: '璁㈠崟浜よ揣鏈�', width: 150, templet: "<div>{{d.璁㈠崟浜よ揣鏈� =='1900-01-01' ?'':layui.util.toDateString(d.璁㈠崟浜よ揣鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
- columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '璁㈠崟闇�姹傛暟閲�', width: 150, sort: true });
- columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150, sort: true });
- columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150, sort: true });
- columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '閿�鍞鍗曞鏍告棩鏈�', title: '閿�鍞鍗曞鏍告棩鏈�', width: 150, hide: true, templet: "<div>{{d.閿�鍞鍗曞鏍告棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞鍗曞鏍告棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', title: '婧愬崟璁㈠崟鍗曟嵁绫诲瀷', width: 150, sort: true, hide: true });
+ columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150, sort: true, hide: true});
+ columns.push({ field: '璁㈠崟浜よ揣鏈�', title: '璁㈠崟浜よ揣鏈�', width: 150, hide: true, templet: "<div>{{d.璁㈠崟浜よ揣鏈� =='1900-01-01' ?'':layui.util.toDateString(d.璁㈠崟浜よ揣鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
+ columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '璁㈠崟闇�姹傛暟閲�', width: 150, sort: true, hide: true });
+ columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150, sort: true, hide: true });
+ columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, hide: true, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, hide: true, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150, sort: true });
- columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150, sort: true });
- columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150, sort: true });
+ columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150, sort: true, hide: true });
+ columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150, sort: true, hide: true });
+ columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150, sort: true, hide: true });
columns.push({ field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 150, sort: true });
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0
- columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0
+ columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150, hide: true });//0
columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide: true });
columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide: true });
columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide: true });
@@ -919,18 +926,18 @@
columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
- columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
- columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true });//0
- columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true });//0
- columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text' });
+ columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true, hide: true});
+ columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true, hide: true });//0
+ columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true, hide: true });//0
+ //columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text' });
columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150, sort: true });//0
- columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '鏈�鏃╁紑宸ユ棩鏈�', title: '鏈�鏃╁紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�鏃╁紑宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.鏈�鏃╁紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '鎿嶄綔宸�', title: '鎿嶄綔宸�', width: 150, edit: 'text', event: "HEmpID" });
+ columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, hide: true, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, hide: true, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '鏈�鏃╁紑宸ユ棩鏈�', title: '鏈�鏃╁紑宸ユ棩鏈�', width: 150, hide: true, templet: "<div>{{d.鏈�鏃╁紑宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.鏈�鏃╁紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '鎿嶄綔宸�', title: '鎿嶄綔宸�', width: 150, edit: 'text', event: "HEmpID", hide: true });
columns.push({ field: 'HMouldID', title: 'HMouldID', width: 150, hide: true });
columns.push({ field: 'HMouldPCTime', title: 'HMouldPCTime', width: 150, hide: true });
- columns.push({ field: '鎵�闇�宸ヤ綅鏁�', title: '鎵�闇�宸ヤ綅鏁�', width: 150 });
+ columns.push({ field: '鎵�闇�宸ヤ綅鏁�', title: '鎵�闇�宸ヤ綅鏁�', width: 150, hide: true });
columns.push({ field: '浣跨敤宸ヨ', title: '浣跨敤宸ヨ', width: 150, hide: true });
columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
option_columns = columns;
@@ -1420,17 +1427,24 @@
}
});
+ var sql = "";
+
if ($("#HMergeDept").val() == "鏄�") {
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
- var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
+ sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
} else {
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
- var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
+ sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
}
if ($("#HWorkShopID").val() == "15035828") {
//鏍规嵁鎺掍骇鏍囪鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹紙閰嶄欢杞﹂棿锛�
- var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HRemark = '閰嶄欢璁㈠崟' and HLockOrder != 1 )";
+ sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HRemark = '閰嶄欢璁㈠崟' and HLockOrder != 1 )";
+ }
+
+ if ($("#HWorkShopID").val().split(",").length >= 2) {
+ //鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
+ sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID in (" + HWorkShopID + ") and HLockOrder != 1 )";
}
$.ajax({
@@ -3469,6 +3483,18 @@
})
}
+ //function get_Export() {
+ // var data = option.data
+ // data.forEach((item) => {
+ // // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+ // if (item.瑙勬牸鍨嬪彿.length > 0) { // 鍋囪瀛楁鍚嶄负field
+ // item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ // item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ // }
+ // });
+ // table.exportFile(ins.config.id, data, "xls");
+ //}
+
function get_Export() {
var data = option.data
data.forEach((item) => {
@@ -3478,18 +3504,54 @@
item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
}
});
- for (let i = 19; i < option.cols[0].length - 40; i++)
+ for (let i = 22; i < option.cols[0].length - 45; i++)
{
- option.cols[0][i].title = Format(option.cols[0][i].title, 'MM-dd').toString();
+ option.cols[0][i].title = ("2026" + "-" + Format(option.cols[0][i].title, 'MM-dd').toString()).toString();
}
- table.exportFile(ins.config.id, data, "xls");
+ // 姝ラ2锛氬畾涔夐渶瑕佹帓闄ょ殑瀛楁锛堜笉瀵煎嚭鐨勫瓧娈碉紝姝ゅ鎺掗櫎 operate 鍜� 鍙澶栨坊鍔犲叾浠栧瓧娈碉級
+ var excludeFields = ['閿佸畾宸ュ崟', '鏄ㄦ棩鏁伴噺', '瑕佽揣鏃ユ湡', '涓氬姟鐘舵��', '浜х嚎鍏ュ簱鏁伴噺', '鏈帓鏁伴噺', '閿�鍞鍗曞鏍告棩鏈�', '璁㈠崟绫诲瀷', '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', '璁㈠崟绛夌骇', '璁㈠崟浜よ揣鏈�', '璁㈠崟闇�姹傛暟閲�', '寮�宸ヤ綑閲�', '鐢熶骇鍛ㄦ湡', '鏈�杩熷紑宸ユ棩鏈�', '鏈�杩熷畬宸ユ棩鏈�', '婧愬崟涓诲唴鐮�', '婧愬崟瀛愬唴鐮�', 'hmainid', '璁￠噺鍗曚綅', '鎷嗗崟鏁伴噺', '鏈叆搴撴暟閲�', 'HICMOInterID', 'HGroupID', 'HGroupName', 'HMaterID', 'HSourceID', 'HWorkShopID', 'HUnitID', 'HProdORGID', 'HEmpID', '鎷嗗崟姹囨姤鏁伴噺', '閿�鍞鍗曟暟閲�', '鏃ヨ鍒掓暟閲忔�婚噺', '鎷嗗崟鏁伴噺', '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', '璁″垝寮�濮嬫棩鏈�', '璁″垝缁撴潫鏃ユ湡', '鏈�鏃╁紑宸ユ棩鏈�', '鎿嶄綔宸�', 'HMouldID', 'HMouldPCTime', '鎵�闇�宸ヤ綅鏁�', '浣跨敤宸ヨ'];
- for (let i = 19; i < option.cols[0].length - 40; i++) {
+ // 姝ラ3锛氱瓫閫夋暟鎹紝鐢熸垚浠呭寘鍚渶瀵煎嚭瀛楁鐨勬柊鏁版嵁
+ var exportData = data.map(function (item) {
+ var newItem = {};
+ // 閬嶅巻褰撳墠鏁版嵁椤圭殑鎵�鏈夊瓧娈�
+ for (var key in item) {
+ // 浠呬繚鐣欎笉鍦ㄦ帓闄ゅ垪琛ㄤ腑鐨勫瓧娈�
+ if (!excludeFields.includes(key)) {
+ newItem[key] = item[key];
+ }
+ }
+ return newItem;
+ });
+
+
+ let processedData = preprocessData(data);
+
+
+ table.exportFile(ins.config.id, processedData, "xls");
+
+ for (let i = 22; i < option.cols[0].length - 45; i++) {
option.cols[0][i].title = Format(option.cols[0][i].title, 'MM.dd');
}
}
+
+ function preprocessData(data) {
+ return data.map(row => {
+ return Object.keys(row).reduce((acc, key) => {
+ let value = row[key];
+ if (typeof value === 'number' || typeof value === 'string') {
+ value = String(value).replace(/"/g, '"');
+ } else if (value instanceof Date) {
+ value = value.toISOString().replace('T', ' ').replace('Z', '');
+ }
+ acc[key] = value;
+ return acc;
+ }, {});
+ });
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index 80f851b..0fcfec5 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -904,9 +904,12 @@
});
}
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ //table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
+
+ option.data = buttonArr;
+ table.render(option);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SaveSNByICMO.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SaveSNByICMO.html"
index ac69aba..ed47439 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SaveSNByICMO.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SaveSNByICMO.html"
@@ -227,7 +227,7 @@
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.close(wait);
- layer.alert(result.Message, { icon: 5 });
+ layer.alert(result.Message, { icon: 1 });
}
else {
layer.close(wait);
--
Gitblit v1.9.1