From c12dbf26b4ee983595a85492f779184e92497ea8 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 13 十一月 2024 14:54:06 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport.html | 4
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 2
WebTM/views/工资管理/班组职员清单/Gy_GroupEmpBillEdit.html | 2
WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html | 9
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckOtherBillList.html | 6
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList2.html | 4
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 2
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 3
WebTM/views/车间管理/报表分析/Cj_TemperatureCurveDryingMachine.html | 369 ++++++++++++++++++++
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html | 58 +-
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 176 +++++++++
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList2.html | 4
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 16
WebTM/views/车间管理/报表分析/Cj_HeatTreatmentTemperatureCurveChart.html | 190 +++++++++-
WebTM/views/index.html | 1
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 154 ++++++++
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport_ICMO.html | 2
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 2
WebTM/WebTM.csproj | 1
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 29 +
WebTM/views/车间管理/报表分析/Sc_PlanAchievementRateReport.html | 21 +
21 files changed, 974 insertions(+), 81 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d78b84b..41110f5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -600,6 +600,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_BatchSplit.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_HeatTreatmentTemperatureCurveChart.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_SPCOscillationCurve.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_TemperatureCurveDryingMachine.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e197e29..6f7e4ed 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -588,6 +588,7 @@
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MateOutSumReport_QiaoYi.html">棰嗘枡缁熻鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_SPCOscillationCurve.html">SPC闇囪崱鏇茬嚎鍥�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_HeatTreatmentTemperatureCurveChart.html">鐑鐞嗘俯搴︽洸绾垮浘</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_TemperatureCurveDryingMachine.html">骞茬嚗鏈烘俯搴︽洸绾垮浘</a></dd>
</dl>
</dd>
<dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index 3e2f0f5..b345950 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -1190,7 +1190,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
if (typeof (openType) != "undefined") {
- return " and 鏄庣粏鏍囪 = 'Y' and 绂佺敤鏍囪 = 'Y'";
+ return " and 鏄庣粏鏍囪 = 'Y' and 绂佺敤鏍囪 != 'Y'";
}
return "";
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html"
index fee5c57..7058040 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html"
@@ -339,7 +339,7 @@
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
- if (rowIndex === '0') {
+ if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
//obj.del();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
index c1ccb28..1a0081d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
@@ -244,33 +244,41 @@
num.push(table.cache["mainTable"][i])
}
}
- data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
- var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(num);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
- var index = layer.load();
-
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave",
- async: true,
- data: { "sMainSub": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
+
+ var HDataSub = [];
+
+ //JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
+ for (var i = 0; i < num.length; i += 100) {
+ HDataSub = num.slice(i, i + 100)
+
+ data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(HDataSub);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
+ });
+ }
}
//琛屽唴鍒犻櫎
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index fdf75bf..a3435e7 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -72,6 +72,11 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_Copy" id="set_Copy">澶嶅埗</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckFlowInfo" id="set_CheckFlowInfo">鏌ョ湅瀹℃壒杩涘害</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill_Flow" id="set_CheckBill_Flow">澶氱骇瀹℃牳</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck_Flow" id="set_AbandonCheck_Flow">澶氱骇鍙嶅鏍�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_RejectCheck_Flow" id="set_RejectCheck_Flow">椹冲洖</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -787,6 +792,7 @@
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
}
});
}
@@ -988,6 +994,29 @@
set_CancelCloseBill(data);
});
+ //鏌ョ湅瀹℃壒杩涘害
+ form.on('submit(set_CheckFlowInfo)', function (data) {
+ set_CheckFlowInfo();
+ });
+
+ //澶氱骇瀹℃牳
+ form.on('submit(set_CheckBill_Flow)', function (data) {
+ set_CheckBill_Flow(0);
+ });
+
+ //澶氱骇鍙嶅鏍�
+ form.on('submit(set_AbandonCheck_Flow)', function (data) {
+ set_CheckBill_Flow(1);
+ });
+ //椹冲洖
+ form.on('submit(set_RejectCheck_Flow)', function (data) {
+ set_RejectCheck_Flow();
+ });
+
+ //澶嶅埗
+ form.on('submit(set_Copy)', function (data) {
+ set_Copy();
+ });
//鏄惁榛樿宸ヨ壓
form.on('checkbox(checkboxHStandard)', function (data) {
@@ -1342,11 +1371,24 @@
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- if (AllowLoadData(data)) {
- set_AddNew(data);
+ const procNos = table.cache["mainTable"].map(item => item.HProcNo);
+ if (isSortedAscending(procNos)) {
+ if (AllowLoadData(data)) {
+ set_AddNew(data);
+ }
+ } else {
+ layer.msg('璇锋敞鎰忔祦姘村彿娆″簭');
}
});
-
+ // 鍑芥暟锛氬垽鏂暟缁勬槸鍚︿粠灏忓埌澶ф帓搴�
+ function isSortedAscending(arr) {
+ for (let i = 0; i < arr.length - 1; i++) {
+ if (arr[i] > arr[i + 1]) {
+ return false;
+ }
+ }
+ return true;
+ }
//閫�鍑�
form.on('submit(btnEdit)', function (data) {
if (params[1] != null) {
@@ -1864,6 +1906,128 @@
});
})
}
+
+ //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill_Flow(num) {
+ var InterID = $("#HInterID").val();
+ if (InterID != 0) {
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Routing/AuditFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨璇烽�夋嫨鍦ㄥ鎵规祦鐨勫崟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 椹冲洖
+ function set_RejectCheck_Flow() {
+ var InterID = $("#HInterID").val();
+ if (InterID != 0) {
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨鍦ㄥ鎵规祦鐨勫崟鎹┏鍥烇紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_Copy() {
+ //鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#hmakers").val(sessionStorage["HUserName"]);
+ $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //璁剧疆hinterid
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3301' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ });
+ OperationType = 2;
+ }
+ //#endregion
+
+ //#region 鏌ョ湅瀹℃壒杩涘害
+ function set_CheckFlowInfo() {
+ var InterID = $("#HInterID").val();
+ if (InterID != 0) {
+ layer.open({
+ type: 2
+ , area: ['70%', '70%']
+ , title: '鍗曟嵁瀹℃壒杩涘害'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../绯荤粺绠＄悊/澶氱骇瀹℃壒/瀹℃壒杩涘害/Xt_CheckFlowProgressList.html?linterid=' + InterID + '&HSouceBillType=3301'
+ , resize: false,
+ end: function () {
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
+ }
+ , cancel: function () {
+
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨姝ｇ‘鏁版嵁鏌ョ湅锛�');
+ }
+ }
+ //#endregion
//琛屽唴鍒犻櫎蹇嵎閿�
function set_GridCellCheck(obj) {
@@ -2766,8 +2930,10 @@
if (i >= dataCol.length) {
continue;
}
-
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
index c9c06a7..c821fe8 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
@@ -944,13 +944,14 @@
function set_RejectCheck_Flow(tableName) {
var checkStatus = table.checkStatus(tableName)
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
+ if (checkStatus.data.length !=0 ) {
+ var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
+ var queryString = uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
+ url: GetWEBURL() + "/Gy_Routing/RejectAllCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterIDS": queryString, "CurUserID": sessionStorage["Czybm"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 0652702..78ce1ec 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -1594,7 +1594,7 @@
return data;
}
- //#endregin
+ //#endregion
//#region 鍙戣捣瀹℃壒
function set_startCheckBill() {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
index 68015b6..018e87e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
@@ -498,7 +498,7 @@
, totalRow: true
//, cellMinWidth: 90
, limit: 50
- , limits: [50, 500, 5000, 50000]
+ , limits: [50, 500, 2000, 5000]
, done: function (res, curr, count) {
soulTable.render(this);
}
@@ -586,8 +586,8 @@
, totalRow: true
, height: 'full-50'
, page: true //寮�鍚垎椤�
- , limit: 500
- , limits: [500, 2000, 5000, 20000]
+ , limit: 50
+ , limits: [50, 2000, 5000]
, cols: [col]
, data: data1.data
, done: function (res, curr, count) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
index d87af26..740754d 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
@@ -569,8 +569,8 @@
, totalRow: true
, height: 'full-50'
, page: true //寮�鍚垎椤�
- , limit: 500
- , limits: [500, 2000, 5000, 20000]
+ , limit: 50
+ , limits: [50, 2000, 5000 ]
, cols: [col]
, data: data1.data
, done: function (res, curr, count) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
index ff6779c..59e22d2 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
@@ -506,8 +506,8 @@
, totalRow: true
, height: 'full-50'
, page: true //寮�鍚垎椤�
- , limit: 500
- , limits: [500, 2000, 5000, 20000]
+ , limit: 50
+ , limits: [50,500, 2000, 5000]
, cols: [col]
, data: data1.data
, done: function (res, curr, count) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index 8e749f0..aa0ea91 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -707,6 +707,7 @@
a = 0;
return false;
}
+
var HProcExchBillNo = $("#HProcExchBillNo").val();
//鍒ゆ柇鏉＄爜涔嬪墠鐨勫伐搴忔槸鍚﹀嚭绔�
$.ajax({
@@ -728,6 +729,28 @@
a = 0;
return false;
}
+
+ //鍒ゆ柇鏉＄爜鐨勯厤浠舵槸鍚︾鍚堟ā鍏� 绌村彿瑕佹眰
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/h_p_CJ_SNBarCodeBillMouldBathSelect",
+ type: "GET",
+ async: false,
+ data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo, "HBillType": "BZ" },
+ success: function (result) {
+ if (result.count == 0) {
+ a = 1;
+ playSound();
+ layer.alert(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ return false;
+ }
+ }
+ })
+
+ if (a == 1) {
+ a = 0;
+ return false;
+ }
+
$.ajax({//鍒ゆ柇鎬荤殑鍖呰鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
url: GetWEBURL() + "/LEMS/h_p_Sc_ProductionLinePackaging_Checkqty",
@@ -1157,11 +1180,7 @@
//var ReportViewer = document.getElementById("ReportViewer");
window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
- if (LDM == "DU3" && BBM == "1099081-00-E") {
-
- } else {
- $("#Print2").click();
- }
+ $("#Print2").click();
});
//鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
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/Cj_ProcessItemStationPlatform.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/Cj_ProcessItemStationPlatform.html"
index daa9edd..f16eafb 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/Cj_ProcessItemStationPlatform.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/Cj_ProcessItemStationPlatform.html"
@@ -941,11 +941,12 @@
var KNum = 0;
function get_Accessory(HBarCode) {
var index = layer.load();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"],"HBillType":"DPGZ"},
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
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_StationOutBillList.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_StationOutBillList.html"
index 9599a28..5d81b32 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_StationOutBillList.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_StationOutBillList.html"
@@ -2127,6 +2127,7 @@
for (let i = 0; i < option.cols[0].length; i++) {
if (option.cols[0][i].field == '宸ュ簭宸ヤ环') {
option.cols[0][i].hide = true; //闅愯棌宸ヤ环瀛楁
+ titleData.push("宸ュ簭宸ヤ环");
}
}
}
@@ -2424,7 +2425,7 @@
//#region 瀵煎嚭Execel
function get_Export() {
var ModRightNameCheck = "Cj_StationOutBillList_ExportExcel";
-
+ var data = getExportData();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
@@ -2432,7 +2433,6 @@
data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- var data = option.data
data.forEach((item) => {
for (let itemobj in item) {
if (item[itemobj] == null) {
@@ -2458,6 +2458,156 @@
}
//#endregion
+ //#region 鑾峰彇瀵煎嚭鏁版嵁
+ function getExportData() {
+ var data;;//瀵煎嚭鐨勬暟鎹�
+ var ajaxLoad = layer.load();
+ if (typeof (params[params[0]]) != "undefined" && lookDownBar == 0) {
+ $("#HProcExchBillNo").val(params[params[0]]);
+ $("#HBeginDate").val("1990-01-01");
+ $("#HEndDate").val("2200-12-30");
+ lookDownBar = 1;
+ }
+ var HStatus = $("select[name='HStatus']").val();//鐘舵��
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HWorkBillNo = $("#HWorkBillNo").val();
+ var HBillNo = $("#HBillNo").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//澶嶉�夋
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val();
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val();
+ var ColContent1 = $("#ColContent1").val();
+ var HNumber = $("#HNumber").val(); //浜у搧浠ｇ爜 鍗崇墿鏂欑紪鐮�
+ var HName = $("#HName").val(); //褰撳墠宸ュ簭
+ var HEmpNumber = $("#HEmpNumber").val(); //鎿嶄綔鍛樹唬鐮�
+ var HEmpName = $("#HEmpName").val(); //鎿嶄綔鍛樺悕绉�
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com = "";
+ switch (Comparator1) {
+ case "7":
+ com = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com;
+ }
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) <= '" + HEndDate + "'";
+ }
+ if (HWorkBillNo) {
+ sWhere += " and 浠诲姟鍗� like '%" + HWorkBillNo + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ if (checkHWasterQty) {
+ sWhere += " and 鎶ュ簾鏁伴噺>0 ";
+ }
+ if (HNumber) {
+ sWhere += " and 浜у搧浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 褰撳墠宸ュ簭 like '%" + HName + "%'";
+ }
+ if (HEmpNumber) {
+ sWhere += " and 鎿嶄綔鍛樹唬鐮� like '%" + HEmpNumber + "%'";
+ }
+ if (HEmpName) {
+ sWhere += " and 鎿嶄綔鍛� like '%" + HEmpName + "%'";
+ }
+
+ if (HStatus) {
+ switch (HStatus) {
+ case '-1': //鍏ㄩ儴
+ sWhere += "";
+ break;
+ case '0': //鏈鏍�
+ sWhere += " and 瀹℃牳浜�='";
+ break;
+ case '1': //宸插鏍�
+ sWhere += " and 瀹℃牳浜�<>'";
+ break;
+ case '2': //宸插叧闂�
+ sWhere += " and 鍏抽棴浜�<>'";
+ default:
+ }
+ }
+ sWhere += " and HBillSubType<>'SUB'";
+ //鏌ヨ璇彞
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ data = data1.data;//鍒楀瓧娈垫暟鎹�
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ sWhere = "";
+ return data;
+
+ }
+ //#endregion
+
+
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
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_StationOutBill_CurrentWork.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_StationOutBill_CurrentWork.html"
index 8d3c14d..681800d 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_StationOutBill_CurrentWork.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_StationOutBill_CurrentWork.html"
@@ -205,8 +205,20 @@
<div class="layui-row" style="margin-bottom: 15px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">绌村彿</label>
- <div class="layui-input-block" style="margin-left: 95px;">
- <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;">
+ <div class="layui-input-block" style="margin-left: 95px; width: 150px">
+ <select name="HMouldNum" id="HMouldNum" lay-verify="required" lay-search class="layui-input" >
+ <option value="0#" selected>0#</option>
+ <option value="1#">1#</option>
+ <option value="2#">2#</option>
+ <option value="3#">3#</option>
+ <option value="4#">4#</option>
+ <option value="5#">5#</option>
+ <option value="6#">6#</option>
+ <option value="7#">7#</option>
+ <option value="8#">8#</option>
+ <option value="9#">9#</option>
+ <option value="10#">10#</option>
+ </select>
</div>
</div>
<div class="layui-inline">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
index 0b46fc7..4faeb20 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
@@ -615,7 +615,7 @@
//#region 鏂板鎸夐挳
form.on('submit(Add)', function () {//鎻愪氦
layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- location.replace('MES_StationInBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+ location.replace('MES_StationInBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2&HMaterToSourceInterID=0');
});
})
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html"
index bd6decd..5c48d04 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html"
@@ -33,22 +33,49 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧</label>
- <div class="layui-input-block">
- <select name="HEquipFileNo" id="HEquipFileNo" lay-verify="required" lay-search class="layui-input">
- <!--鍔ㄦ�佹覆鏌撹溅闂�-->
- </select>
+ <label class="layui-form-label" style="width: 85px;">璁惧缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" style="background-color: #efefef4d;" readonly>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquip" id="btnHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">ID鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" value="">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
</div>
</div>
<div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
- <div id="HeatTreatmentTemperatureCurveChart" style="width:99.5%;height:calc(100vh);margin-top:5px;"> </div>
+ <div id="HeatTreatmentTemperatureCurveChart" style="width:99.5%;height:calc(85vh);"></div>
</div>
</form>
</div>
@@ -107,6 +134,16 @@
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HEquipNumber = $("#HEquipNumber").val();
+ if (HEquipNumber == "") {
+ layer.msg("璁惧缂栧彿涓嶈兘涓虹┖");
+ return false;
+ }
+ if (HProcExchBillNo == "") {
+ layer.msg("ID鍙蜂笉鑳戒负绌�");
+ return false;
+ }
get_FastQuery();
});
@@ -117,6 +154,11 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ get_FastQuery();
+ }
+
if (OperationType == 1) {
//get_HProcHBillNoId(linterid);
get_FastQuery();
@@ -145,6 +187,8 @@
}
option = data1;
set_Line();
+ ColNameData = [];
+ DateData = [];
} else {
layer.close(wait);
@@ -157,6 +201,44 @@
});
}
+ //璁惧寮圭獥
+ form.on('submit(btnHEquip)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧妗ｆ鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEquipNumber").val(checkStatus.data[0].璁惧缂栫爜);
+ $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//鎶樼嚎鍥�
function set_Line() {
//#region銆愭姌绾垮浘銆�
@@ -167,17 +249,52 @@
var Data_series = [];
- for (var i = 0; i < ColNameData.length; i++) {
- var optionData = [];//鍊兼暟鎹�
- for (var j = 0; j < DateData.length; j++) {
- optionData.push(option.data[j][ColNameData[i]]);
+ if (ColNameData.length == 0) {
+ var ColNameData_s = ["鐢垫祦", "涓婂尯瀹為檯娓╁害", "涓尯瀹為檯娓╁害", "涓嬪尯瀹為檯娓╁害", "璁惧畾娓╁害"];
+ for (var i = 0; i < ColNameData_s.length; i++) {
+ var optionData = [];//鍊兼暟鎹�
+ for (var j = 0; j < DateData.length; j++) {
+ optionData.push(option.data[j][ColNameData_s[i]]);
+ }
+ Data_series.push({
+ name: ColNameData_s[i],
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ //stack: 'Total', //琛ㄧず鎶樼嚎鍫嗗彔
+ data: []
+ })
}
- Data_series.push({
- name: ColNameData[i],
- type: 'line',
- //stack: 'Total', //琛ㄧず鎶樼嚎鍫嗗彔
- data: optionData
- })
+ }
+ else {
+ for (var i = 0; i < ColNameData.length; i++) {
+ var optionData = [];//鍊兼暟鎹�
+ for (var j = 0; j < DateData.length; j++) {
+ optionData.push(option.data[j][ColNameData[i]]);
+ }
+ Data_series.push({
+ name: ColNameData[i],
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ //stack: 'Total', //琛ㄧず鎶樼嚎鍫嗗彔
+ data: optionData
+ })
+ }
}
option_Data = {
@@ -187,7 +304,9 @@
left: 'center'
},
legend: {
- data: ColNameData
+ data: (ColNameData.length == 0 ? ["鐢垫祦", "涓婂尯瀹為檯娓╁害", "涓尯瀹為檯娓╁害", "涓嬪尯瀹為檯娓╁害", "璁惧畾娓╁害"] : ColNameData),
+ top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
+ left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
},
grid: {
top:"13%",
@@ -205,8 +324,13 @@
},
yAxis: {
type: 'value',
- min: 0,
- max:1000
+ min: function(value) {
+ return value.min;
+ },
+ max:function(value) {
+ return value.max+10;
+ },
+ interval: 30
},
series: Data_series
};
@@ -218,6 +342,26 @@
//蹇�熻繃婊�
function get_FastQuery() {
+ var HEquipNumber = $("#HEquipNumber").val();
+ var HEquipName = $("#HEquipName").val();
+ var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+
+
+ if (HEquipNumber != "" && HProcExchBillNo != "") {
+ sWhere = {
+ HEquipNumber: HEquipNumber
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HProcExchBillNo: HProcExchBillNo
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ } else {
+ set_Line();
+ }
+
var HEquipFileNo = $("#HEquipFileNo").val();
sWhere = HEquipFileNo;
get_Display(sWhere);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_TemperatureCurveDryingMachine.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_TemperatureCurveDryingMachine.html"
new file mode 100644
index 0000000..15d2fc9
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_TemperatureCurveDryingMachine.html"
@@ -0,0 +1,369 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>骞茬嚗鏈烘俯搴︽洸绾垮浘</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁惧缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquip" id="btnHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <select name="HProcExchBillNo" id="HProcExchBillNo" lay-search class="layui-input">
+ <option value=""></option>
+ <!--鍔ㄦ�佹覆鏌�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ </div>
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="HeatTreatmentTemperatureCurveChart" style="width:99.5%;height:calc(85vh);"></div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var ColNameData = [];//鍒楀悕鏁版嵁
+ var DateData = [];//鏃ユ湡鏁版嵁
+ var HModName = "Cj_HeatTreatmentTemperatureCurveChart";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HEquipNumber = $("#HEquipNumber").val();
+ if (HEquipNumber == "") {
+ layer.msg("璁惧缂栧彿涓嶈兘涓虹┖");
+ return false;
+ }
+ get_FastQuery();
+ });
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ get_FastQuery();
+ }
+
+ //鏌ヨ鏁版嵁
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/Cj_NoPassProc/Cj_TemperatureCurveDryingMachine',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(wait);
+ for (var i = 1; i < data1.list.length; i++) {
+ ColNameData.push(data1.list[i]["ColmCols"]);
+ }
+ var data = data1.data.h_p_Cj_TemperatureCurveDryingMachine;
+ var data_No = data1.data.h_p_Cj_TemperatureCurveDryingMachine1;
+ for (var i = 0; i < data.length; i++) {
+ DateData.push(data[i]["HDate"]);
+ }
+ $("#HProcExchBillNo").empty();
+ var HProcExchBillNo = "<option value=''></option>";
+ for (var i = 0; i < data_No.length; i++) {
+ HProcExchBillNo += '<option style="color:blue;" value="' + data_No[i].HProcExchBillNo + '" >' + data_No[i].HProcExchBillNo + '</option>';
+ }
+ $("#HProcExchBillNo").append(HProcExchBillNo);
+ form.render('select');
+ option = data1;
+ set_Line();
+ ColNameData = [];
+ DateData = [];
+
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //璁惧寮圭獥
+ form.on('submit(btnHEquip)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧妗ｆ鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEquipNumber").val(checkStatus.data[0].璁惧缂栫爜);
+ $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //鎶樼嚎鍥�
+ function set_Line() {
+ //#region銆愭姌绾垮浘銆�
+ //骞冲潎鍊�
+ var chartDom = document.getElementById('HeatTreatmentTemperatureCurveChart');
+ var myChart = echarts.init(chartDom);
+ var option_Data;
+
+ var Data_series = [];
+
+ if (ColNameData.length == 0) {
+ var ColNameData_s = ["娓╁害"];
+ for (var i = 0; i < ColNameData_s.length; i++) {
+ var optionData = [];//鍊兼暟鎹�
+ for (var j = 0; j < DateData.length; j++) {
+ optionData.push(option.data[j][ColNameData_s[i]]);
+ }
+ Data_series.push({
+ name: ColNameData_s[i],
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ //stack: 'Total', //琛ㄧず鎶樼嚎鍫嗗彔
+ data: []
+ })
+ }
+ }
+ else {
+ for (var i = 0; i < ColNameData.length; i++) {
+ var optionData = [];//鍊兼暟鎹�
+ for (var j = 0; j < DateData.length; j++) {
+ optionData.push(option.data.h_p_Cj_TemperatureCurveDryingMachine[j][ColNameData[i]]);
+ }
+ Data_series.push({
+ name: ColNameData[i],
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ //stack: 'Total', //琛ㄧず鎶樼嚎鍫嗗彔
+ data: optionData
+ })
+ }
+ }
+
+ option_Data = {
+ title: {
+ text: '骞茬嚗鏈烘俯搴︽洸绾垮浘',
+ top: '3%',
+ left: 'center'
+ },
+ legend: {
+ data: (ColNameData.length == 0 ? ["娓╁害"] : ColNameData),
+ top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
+ left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
+ },
+ grid: {
+ top: "13%",
+ x: '3%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+ //y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+ //bottom: '5%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: DateData,
+ axisLabel: {
+ interval: 1 // 璁剧疆涓�0浠ユ樉绀烘墍鏈夊潗鏍囩偣
+ }
+ },
+ yAxis: {
+ type: 'value',
+ min: function (value) {
+ return value.min - 2;
+ },
+ max: function (value) {
+ return value.max + 2;
+ },
+ interval: 1
+ },
+ series: Data_series
+ };
+ option_Data && myChart.setOption(option_Data);
+
+ //#endregion
+
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HEquipNumber = $("#HEquipNumber").val();
+ var HEquipName = $("#HEquipName").val();
+ var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+
+
+ if (HEquipNumber != "") {
+ sWhere = {
+ HEquipNumber: HEquipNumber
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HProcExchBillNo: HProcExchBillNo
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ } else {
+ set_Line();
+ }
+
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HEquipFileNo").val("0");
+ form.render()
+ sWhere = "";
+ }
+
+ //#endregion
+ });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
index 157b66e..98b957f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
@@ -449,7 +449,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_ICMO.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_ICMO.html"
index f4b8fd3..c207d66 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_ICMO.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_ICMO.html"
@@ -104,7 +104,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var HModName = "Mes_OrderProcFlowAllReport";
+ var HModName = "Mes_OrderProcFlowAllReport_ICMO";
var ins;
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_PlanAchievementRateReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_PlanAchievementRateReport.html"
index 21bdb4c..9e0f8cc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_PlanAchievementRateReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_PlanAchievementRateReport.html"
@@ -87,6 +87,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_export" id="get_export" style="padding:0 5px">瀵煎嚭</button>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
@@ -217,6 +218,7 @@
var option = [];
var HModName = "Sc_PlanAchievementRateReport";
var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
@@ -249,6 +251,23 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+
+ //瀵煎嚭
+ form.on('submit(get_export)', function (data) {
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',','锛�'); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ });
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
form.on('select(HInitTimeCycle)', function (data) {
@@ -416,7 +435,7 @@
});
}
}
- table.render(option);
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
--
Gitblit v1.9.1