From 9f1c2ac41687335fe2faa470cfb63ee3a8ecd821 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 10 十月 2024 14:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
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 03f2025..4001f8b 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"
@@ -284,6 +284,7 @@
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ , "HControlUpperLimit": 0, "HControlLowerLimit":0
};
switch (obj.event) {
//鏂板涓�琛�
@@ -534,7 +535,7 @@
Pub_Close(2);
} else {
Pub_Close(1);
- }
+ }
//var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
//parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
@@ -647,7 +648,11 @@
}
//灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
for (var i = 0; i < checkStatus.data.length; i++) {
- buttonArr.push({ "HPrjNo": i + 1, "HQCCheckItemID": checkStatus.data[i].HItemID, "HQCCheckItemNumber": checkStatus.data[i].浠ｇ爜, "HQCCheckItemName": checkStatus.data[i].鍚嶇О, "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": "" });
+ buttonArr.push({
+ "HPrjNo": i + 1, "HQCCheckItemID": checkStatus.data[i].HItemID, "HQCCheckItemNumber": checkStatus.data[i].浠ｇ爜, "HQCCheckItemName": checkStatus.data[i].鍚嶇О, "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": ""
+ , "HTargetVal": 0, "HUpLimit": 0, "HDownLimit": 0, "HUpOffSet": 0, "HDownOffSet": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0, "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
+ , "HDownOffSetQ": 0
+ });
}
table.reload("mainTable", {
@@ -927,6 +932,8 @@
, { field: 'HDownLimitTxt', title: '涓嬮檺鍊兼枃鏈�', edit: 'text' }
, { field: 'HUpOffSetTxt', title: '涓婂亸宸枃鏈�', edit: 'text' }
, { field: 'HDownOffSetTxt', title: '涓嬪亸宸枃鏈�', edit: 'text' }
+ , { field: 'HControlUpperLimit', title: '鎺у埗涓婇檺', edit: 'text' }
+ , { field: 'HControlLowerLimit', title: '鎺у埗涓嬮檺', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -943,7 +950,7 @@
, done: function (res, curr, count) {
}
- };
+ };
}
//淇濆瓨
@@ -996,6 +1003,7 @@
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ , "HControlUpperLimit": 0, "HControlLowerLimit": 0
}];
table.render(option);
}
@@ -1013,6 +1021,7 @@
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ , "HControlUpperLimit": 0, "HControlLowerLimit": 0
}];
table.render(option);
}
@@ -1170,6 +1179,7 @@
"HDownLimitTxt": data[i].涓嬮檺鍊兼枃鏈�, "HUpOffSetTxt": data[i].涓婂亸宸枃鏈�, "HDownOffSetTxt": data[i].涓嬪亸宸枃鏈�,
"HQualityStdName": data[i].璐ㄩ噺鏍囧噯鍚嶇О, "HInspectMethodName": data[i].妫�楠屾柟娉曞悕绉�, "HInspectInstruMentName": data[i].妫�楠屼华鍣ㄥ悕绉�,
"HInspectBasisName": data[i].妫�楠屼緷鎹悕绉�, "HSampleSchemeName": data[i].瀛愭娊鏍锋柟妗堝悕绉�
+ , "HControlUpperLimit": data[i].鎺у埗涓婇檺, "HControlLowerLimit": data[i].鎺у埗涓嬮檺
});
}
@@ -1235,18 +1245,23 @@
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
- //table.cache["mainTable"].push(NewRow);
- //option.data = table.cache["mainTable"];
- //table.render(option);
- var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < tableBak.length; i++) {
- buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ $('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
+ $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+
+ if (option.data[i - 1].HDestructInspect) {
+ $('#HDestructInspect' + i + '').attr("checked", true);
+ }
+ if (option.data[i - 1].HKeyInspect) {
+ $('#HKeyInspect' + i + '').attr("checked", true);
+ }
}
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ form.render('select');
+ form.render('checkbox');
}
//澶嶅埗涓�琛�
@@ -1264,6 +1279,20 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ $('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
+ $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+
+ if (option.data[i - 1].HDestructInspect) {
+ $('#HDestructInspect' + i + '').attr("checked", true);
+ }
+ if (option.data[i - 1].HKeyInspect) {
+ $('#HKeyInspect' + i + '').attr("checked", true);
+ }
+ }
+ form.render('select');
+ form.render('checkbox');
}
}
--
Gitblit v1.9.1