Skip to content

Commit c722088

Browse files
fayykfayyk
committed
add
1 parent 1c97434 commit c722088

File tree

7 files changed

+570
-271
lines changed

7 files changed

+570
-271
lines changed

‎XXX.html‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!-- @format -->
2+
3+
<!DOCTYPE html>
4+
<html lang="en">
5+
<head>
6+
<meta charset="UTF-8" />
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<title>Document</title>
9+
</head>
10+
<body></body>
11+
<script>
12+
function isScientificNotation(str) {
13+
const scientificNotationRegex = /^[+-]?\d+(\.\d+)?([eE][+-]?\d+)?$/
14+
return scientificNotationRegex.test(str)
15+
}
16+
console.log(isScientificNotation("fdfdsfd"))
17+
18+
console.log(Number("5e+1000") > Number("5e+10")) // Number overflow, NaN
19+
</script>
20+
</html>

‎data/jjDetials.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
{
2-
"head": {
2+
"head":
3+
{
34
"code": "10000",
45
"subCode": null,
56
"message": null,
67
"subMessage": null,
78
"transactionId": null
89
},
9-
"body": {
10-
"data": [
10+
"body":
11+
{
12+
"data":
13+
[
1114
{
1215
"rownum": 1,
1316
"routeId": "DCGX",
@@ -323,4 +326,4 @@
323326
],
324327
"total": 25
325328
}
326-
}
329+
}

‎pages/hyCheckPortal/js/define.js‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function amTypeStore(type) {
6767
proxy: {
6868
type: "ajax",
6969
actionMethods: { read: "GET" },
70-
url: actionUrl + "?op=getCycleType&windowFlag=1",
70+
url: actionUrlTwo + "?op=getCycleType&windowFlag=1",
7171
requestMethod: "getCycleType",
7272
queryMask: false
7373
},
@@ -80,7 +80,7 @@ function amTypeStore(type) {
8080
proxy: {
8181
type: "ajax",
8282
actionMethods: { read: "GET" },
83-
url: mycim2dev + "/eqptPMPortal.do?op=getCycleType",
83+
url: actionUrlTwo + "?op=getCycleType",
8484
requestMethod: "getCycleType",
8585
queryMask: false
8686
},
@@ -292,6 +292,8 @@ function check4Schedule() {
292292
var onOff = waferQtyContainer.getComponent("itemStatus").getValue()
293293
var comments = waferQtyContainer.getComponent("comment").getValue()
294294
var checklistId = waferQtyContainer.getComponent("checklistId").getValue()
295+
var autoBy = waferQtyContainer.getComponent("byColumn").getComponent("autoBy").getValue()
296+
var byStandardQty = waferQtyContainer.getComponent("byColumn").getComponent("byStandardQty").getValue()
295297

296298
var resultMsg = ""
297299
if (!eqptId || eqptId.length <= 0) {
@@ -318,6 +320,9 @@ function check4Schedule() {
318320
if (!onOff || onOff.length <= 0) {
319321
resultMsg += "The on/off cannot be empty!<br>"
320322
}
323+
if (autoBy === "YES" && isNull(byStandardQty)) {
324+
resultMsg += "The byStandardQty cannot be empty!<br>"
325+
}
321326

322327
if (resultMsg.length > 0) {
323328
showWarningAlert(resultMsg)
@@ -337,6 +342,8 @@ function check4Count() {
337342
var onOff = waferQtyContainer.getComponent("itemStatus").getValue()
338343
var comments = waferQtyContainer.getComponent("comment").getValue()
339344
var checklistId = waferQtyContainer.getComponent("checklistId").getValue()
345+
var autoBy = waferQtyContainer.getComponent("byColumn").getComponent("autoBy").getValue()
346+
var byStandardQty = waferQtyContainer.getComponent("byColumn").getComponent("byStandardQty").getValue()
340347

341348
var resultMsg = ""
342349
if (!eqptId || eqptId.length <= 0) {
@@ -363,6 +370,9 @@ function check4Count() {
363370
if (!onOff || onOff.length <= 0) {
364371
resultMsg += "The on/off cannot be empty!<br>"
365372
}
373+
if (autoBy === "YES" && isNull(byStandardQty)) {
374+
resultMsg += "The byStandardQty cannot be empty!<br>"
375+
}
366376

367377
if (resultMsg.length > 0) {
368378
showWarningAlert(resultMsg)
@@ -941,6 +951,21 @@ function getChecklistJobData() {
941951
})
942952
}
943953

954+
function getBYChecklistJobData() {
955+
let checklistJobRrn = Ext.getCmp("eqptPMGrid").getSelectionModel().getSelection()[0].get("checklistJobRrn")
956+
Ext.Ajax.request({
957+
url: actionUrlTwo,
958+
requestMethod: "getCheckListJob",
959+
method: "POST",
960+
params: { checklistJobRrn },
961+
success: function (resp) {
962+
refreshHyBasicDetailForm(resp)
963+
refreshSuppliesGrid(resp)
964+
refreshSuppliesLotNumberGrid(resp)
965+
}
966+
})
967+
}
968+
944969
function refreshHyBasicDetailForm(data) {
945970
const hyBasicDetailForm = Ext.getCmp("hyBasicDetailForm")
946971
hyBasicDetailForm.getForm().findField("checklistJobRrn").setValue(data.checklistJobRrn)
@@ -970,6 +995,7 @@ function saveLotNumberIssue(issueWin) {
970995
params.supplyRrn = issueForm.getValues().supplyRrn
971996
params.lotNumber = issueForm.getValues().lotNumber
972997
params.issueQty = issueForm.getValues().issueQty
998+
params.comments = issueForm.getValues().comments
973999

9741000
Ext.Ajax.request({
9751001
url: actionUrlTwo,
@@ -1061,7 +1087,7 @@ function checkCurrStatusForPM() {
10611087

10621088
if (invalidEqptIds && invalidEqptIds.length > 0) {
10631089
invalidEqptIds = invalidEqptIds.substring(0, invalidEqptIds.lastIndexOf(","))
1064-
showWarningAlert(window.CN0EN == "EN" ? "The " + invalidEqptIds + " current status is AM!" : "设备：" + invalidEqptIds + " 当前状态为AM,请先AM！")
1090+
showWarningAlert(window.CN0EN == "EN" ? "The " + invalidEqptIds + " current status is AM!" : "设备：" + invalidEqptIds + " 当前状态为PM,请先PM！")
10651091
return false
10661092
} else {
10671093
return true

0 commit comments

Comments
 (0)