From 7ed546192a84e33561330062cdb48790fcdb5eef Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 19 九月 2024 08:57:55 +0800
Subject: [PATCH] 1.设备/模具:保养规程 表头增加 HErrWarDays int --预警天数 2.设备/模具:保养计划单增加HErrBeginTime datetime --预警开始时间点,审核时把子表 预警开始时间点, 填入 3.设备启动点检清单/启动点检清单:增加字段HDotCheckType varchar(50) --点检类型(设备,模具,作业指导书,检验指导书) HRelationID int --关联ID(设备内码或模具内码) 4.启动点检单: 新增 子表界面 根据不同的点检类型,点击查看,弹出不同的数据(根据表头日期查询(按照当前月显示)) .工艺参数点检:增加附件上传功能 2.设备工艺参数趋势图:根据流转卡的子表进站出站时间查询工艺参数(增加一个选择框 采集来源:(设备采集,手动输入)) 3.开工:增加设备启动点检,防错验证控制
---
WebTM/views/IpadStepIndex.html | 269 +++++++++++++++++++++++++++--------------------------
1 files changed, 139 insertions(+), 130 deletions(-)
diff --git a/WebTM/views/IpadStepIndex.html b/WebTM/views/IpadStepIndex.html
index 38c0809..e1ddb06 100644
--- a/WebTM/views/IpadStepIndex.html
+++ b/WebTM/views/IpadStepIndex.html
@@ -83,6 +83,9 @@
html1 += '<dd>';
html1 += '<h1 style="display:none;"><span>璧勬簮ID锛�</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
html1 += '<h1><span>璁惧缂栧彿锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
+ html1 += '<h1><span>璁惧浠ｇ爜锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>';
+ html1 += '<h1><span>鎿嶄綔鍛橈細</span><span id="eqp' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>';
+ html1 += '<h1><span>鐢熶骇鐝粍锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
//html1 += '<h1><span>褰撳墠宸ュ崟锛�</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
//html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
//html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
@@ -195,8 +198,8 @@
}
html1 += '<span class="prs">鐢熶骇杩涘害锛�</span>';
html1 += '<div class="layui-progress layui-progress-big" lay-showPercent="yes">';
- html1 += '<div class="layui-progress-bar" lay-percent="' + (LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty)*100 + '%" style="width:' + (LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty)*100 + '%;">';
- html1 += '<span class="layui-progress-text">' + (LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty)*100 + '%</span>';
+ html1 += '<div class="layui-progress-bar" lay-percent="' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%" style="width:' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%;">';
+ html1 += '<span class="layui-progress-text">' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%</span>';
html1 += '</div > ';
html1 += '</div>';
html1 += '</dd>';
@@ -225,7 +228,7 @@
html1 += '<h1><span>杩涘害锛�</span><span>0%</span></h1>';
}
else {
- html1 += '<h1><span>杩涘害锛�</span><span>' + (LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100 + '%</span></h1>';
+ html1 += '<h1><span>杩涘害锛�</span><span>' + ((LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100).toFixed(2) + '%</span></h1>';
}
html1 += '<h1><span>鏈崟杩愯鏃堕棿锛�</span><span>' + getSeconds(LoadData2[i].HSumTimes) + '</span></h1>';
html1 += '<h1><span>褰撳墠宸ュ簭锛�</span><span>' + LoadData2[i].HProcName + '</span></h1>';
@@ -554,25 +557,25 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType+'',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -594,25 +597,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -634,25 +638,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -674,25 +679,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -710,30 +716,31 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=&workcode=' + workcode + '&HSourceID=' + HSourceID1 + '&HSourceName=' + HSourceName1 + '&HICMOInterID=' + HICMOInterID + '&HICMOEntryID=' + HICMOEntryID + '&HMaker=' + sessionStorage["HUserName"] + '&Czybm=' + sessionStorage["Czybm"] + '&HSourceInterID=' + HSourceInterID + '&HSourceBillType=' + HSourceBillType + '&HProcID=' + HProcID+'',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- var data = [];
- data.push({
- "workcode": workcode,
- "HSourceID": HSourceID1,
- "HSourceName": HSourceName1,
- "HICMOInterID": HICMOInterID,
- "HICMOEntryID": HICMOEntryID,
- "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
- "Czybm": sessionStorage["Czybm"],
- //"HEmpID": "0", //sessionStorage["HEmpID"]
- "HSourceInterID": HSourceInterID,
- "HSourceBillType": HSourceBillType,
- "HProcID": HProcID
- });
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ //success: function (dom, index) {
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // var data = [];
+ // data.push({
+ // "workcode": workcode,
+ // "HSourceID": HSourceID1,
+ // "HSourceName": HSourceName1,
+ // "HICMOInterID": HICMOInterID,
+ // "HICMOEntryID": HICMOEntryID,
+ // "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
+ // "Czybm": sessionStorage["Czybm"],
+ // //"HEmpID": "0", //sessionStorage["HEmpID"]
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceBillType": HSourceBillType,
+ // "HProcID": HProcID
+ // });
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -755,24 +762,25 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_Add_MESReturnStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_Add_MESReturnStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_Add_MESReturnStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ //success: function (dom, index) {
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -790,25 +798,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -852,26 +861,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
-
- content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
--
Gitblit v1.9.1