From 7436dccd501515b46d37b802696cad0c1b3bd54e Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期五, 05 十二月 2025 13:25:21 +0800
Subject: [PATCH] 分析方法、检验方法、上限值、下限值、测量值
---
WebTM/WebTM.csproj.user | 4
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill_XW.html | 194 ++++++++++++++++++++++++++++++++++++++++++++++-
WebTM/layuiadmin/Scripts/webConfig.js | 4
3 files changed, 191 insertions(+), 11 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 89909e4..48ade9c 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,9 +2,9 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\GitHub\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 13dc180..947f01f 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,13 +5,13 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
/*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ /* var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
- /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
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_Add_Edit_PatrolProcCheckBill_XW.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_Add_Edit_PatrolProcCheckBill_XW.html"
index 54ac5a6..ef063c7 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_Add_Edit_PatrolProcCheckBill_XW.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_Add_Edit_PatrolProcCheckBill_XW.html"
@@ -340,6 +340,15 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
+ <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+ <script type="text/html" id="HAnalysisMethod">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+ </script>
<!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�1)-->
<script type="text/html" id="HQCNote1">
<select name="HQCNote1" lay-filter="HQCNote1" id="HQCNote1{{d.LAY_TABLE_INDEX+1}}">
@@ -387,7 +396,7 @@
<option value="鍚堟牸">鍚堟牸</option>
<option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
</select>
- </script>
+ </script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -473,7 +482,15 @@
, { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', event: "", width: 120 }
, { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
, { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 230 }
- , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 95, hide: true }
+ /////////////
+ , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+ , { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName'}
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 125, hide: true }
+ , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text', width: 125, hide: true }
+ , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text', width: 125, hide: true }
+ , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', width: 125, hide: true }
+ , { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text' }
, { field: 'HQCNote1', title: '08:00--10:00', width: 125, templet: '#HQCNote1' }
, { field: 'HQCNote2', title: '10:00--12:00', width: 125, templet: '#HQCNote2' }
@@ -498,6 +515,25 @@
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 75 }
]]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ //, done: function (res, curr, count) {
+ // option.data = res.data;
+ // //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ // $('.layui-form-select').find('input').unbind("blur");
+ // //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ // $('tr').each(function (e) {
+ // var $cr = $(this);
+ // var dataIndex = $cr.attr("data-index");
+ // $.each(option.data, function (index, value) {
+ // if (value.LAY_TNDEX == dataIndex) {
+ // $cr.find('input').val(value.HResult);
+ // $cr.find('input').val(value.HAnalysisMethod);
+ // }
+ // });
+ // });
+ //}
+ //, text: {
+ // none: '鏃犳暟鎹紒'
+ //}
};
var option_BadRe = {
@@ -543,6 +579,7 @@
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
option.data = [{
+ "HAnalysisMethod": 1, "HUpLimit": "", "HDownLimit": "", "HInspectMethodID": 0, "HInspectMethodName": "", "HTargetVal": "",
"妫�楠岄」鐩垎绫�": "", "HQCCheckItemID": 0, "HQCCheckItemName": "", "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " "
, "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
, "HQCNote1_SN": "", "HQCNote2_SN": "", "HQCNote3_SN": "", "HQCNote4_SN": "", "HQCNote5_SN": "", "HQCNote6_SN": "", "HQCNote7_SN": ""
@@ -587,7 +624,19 @@
var rowdata = [];
var data = result.data;
for (let i = 0; i < result.data.length; i++) {
+ switch (data[i].鍒嗘瀽鏂规硶) {
+ case "瀹氭�у垎鏋�":
+ data[i].鍒嗘瀽鏂规硶 = "1";
+ break;
+ case "瀹氶噺鍒嗘瀽":
+ data[i].鍒嗘瀽鏂规硶 = "2";
+ break;
+ case "鍏朵粬鍒嗘瀽":
+ data[i].鍒嗘瀽鏂规硶 = "3";
+ break;
+ }
rowdata.push({
+ "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].HInspectMethodName, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HTargetVal": data[i].鐩爣鍊�,
"妫�楠岄」鐩垎绫�": data[i].妫�楠岄」鐩垎绫�, "HQCCheckItemID": data[i].HQCCheckItemID, "HQCCheckItemName": data[i].妫�楠岄」鐩悕绉�,
"HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
"HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
@@ -610,6 +659,19 @@
option.data = rowdata;
table.render(option);
for (var i = 0; i < result.data.length; i++) {
+ switch (data[(i - 1)].鍒嗘瀽鏂规硶) {
+ case "瀹氭�у垎鏋�":
+ data[(i - 1)].鍒嗘瀽鏂规硶 = "1";
+ break;
+ case "瀹氶噺鍒嗘瀽":
+ data[(i - 1)].鍒嗘瀽鏂规硶 = "2";
+ break;
+ case "鍏朵粬鍒嗘瀽":
+ data[(i - 1)].鍒嗘瀽鏂规硶 = "3";
+ break;
+
+ }
+ $('#HAnalysisMethod' + i + '').find("option[value='" + (data[(i - 1)].鍒嗘瀽鏂规硶) + "']").attr("selected", true);
$('#HQCNote1' + (i + 1)).find("option[value='" + result.data[i].HQCNote1 + "']").attr("selected", true);
$('#HQCNote2' + (i + 1)).find("option[value='" + result.data[i].HQCNote2 + "']").attr("selected", true);
$('#HQCNote3' + (i + 1)).find("option[value='" + result.data[i].HQCNote3 + "']").attr("selected", true);
@@ -663,6 +725,7 @@
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
var NewRow = {
+ "HInspectMethodID": 0, "HInspectMethodName": "", "HUpLimit": '', "HDownLimit": '', "HInspectVal": '', "HAnalysisMethod": "",
"HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
, "HQCNote1_SN": $("#HQCNote1_SN").val() || '', "HQCNote2_SN": $("#HQCNote2_SN").val() || '', "HQCNote3_SN": $("#HQCNote3_SN").val() || '', "HQCNote4_SN": $("#HQCNote4_SN").val() || '', "HQCNote5_SN": $("#HQCNote5_SN").val() || '', "HQCNote6_SN": $("#HQCNote6_SN").val() || '', "HQCNote7_SN": $("#HQCNote7_SN").val() || '', "HQCNote8_SN": $("#HQCNote8_SN").val() || '', "HQCNote9_SN": $("#HQCNote9_SN").val() || '', "HQCNote10_SN": $("#HQCNote10_SN").val() || ''
};
@@ -672,6 +735,11 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+/* $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);*/
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ }
+ form.render('select');
rows++;
layer.msg('澧炲姞涓�琛屾寜閽紒')
break;
@@ -689,6 +757,11 @@
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++) {
+ /* $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);*/
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ }
+ form.render('select');
//layer.alert(copyrow);
}
break;
@@ -971,7 +1044,53 @@
}
});
}
+ //if (obj.event == 'HInspectMethodName') //
+ //{
+ // //椤甸潰灞�-鑷畾涔�
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '妫�楠屾柟娉曞垪琛�',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['80%', '80%'],
+ // maxmin: true,
+ // content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.html?openType=2', '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('璇烽�夋嫨鏁版嵁');
+ // }
+ // obj.update({
+ // HInspectMethodID: checkStatus.data[0].HItemID,
+ // HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉曞悕绉�,
+ // });
+ // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) {
+ // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ // },
+ // end: function () {
+ // if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // obj.update({
+ // "HInspectMethodID": OptionData[0].HItemID
+ // , "HInspectMethodName": OptionData[0].妫�楠屾柟娉曞悕绉�
+ // })
+ // } else {
+ // layer.msg("璇ユ楠屾柟娉曞凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+ // }
+ // },
+ // success: function (layero, index) {
+
+ // }
+ // });
+ //}
obj.event = "";
return false;
@@ -983,6 +1102,43 @@
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'HInspectMethodName') {
+ $(document).off('keydown').on('keydown', function (e) {
+ if (e.key === "F7" || e.keyCode === 118) {
+ // 闃绘榛樿琛屼负
+ e.preventDefault();
+
+ // 鎵撳紑妫�楠屾柟娉曢�夋嫨绐楀彛
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '妫�楠屾柟娉曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.html?openType=2', 'yes'],
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ // 鏇存柊鏁版嵁
+ obj.update({
+ HInspectMethodID: checkStatus.data[0].HItemID,
+ HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉曞悕绉�,
+ });
+ layer.close(index);
+ }
+ });
+
+ return false;
+ }
+ });
+ }
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
@@ -1341,10 +1497,11 @@
$("#HQCSchemeID").val(result.data[0].hmainid);
$("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
var rowdata = [];
- var data = result.data;
+ var data = result.data;
for (var i = 0; i < result.data.length; i++) {
//瀛愯〃 璧嬪��
rowdata.push({
+ "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3),
"妫�楠岄」鐩垎绫�": data[i]["妫�楠岄」鐩垎绫�"], "HQCCheckItemID": data[i]["HQCCheckItemID"], "HQCCheckItemName": data[i]["妫�楠岄」鐩�"],
"HQCStd": "",
"HQCNote1": "",
@@ -1367,11 +1524,16 @@
"HQCNote7_SN": "",
"HQCNote8_SN": "",
"HQCNote9_SN": "",
- "HQCNote10_SN": ""
+ "HQCNote10_SN": "",
+ "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].妫�楠屾柟娉�, "HInspectVal": data[i].妫�娴嬪��, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�
});
}
option.data = rowdata;
table.render(option);
+ for (let j = 0; j < data.length; j++) {
+ $("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
+ }
+ form.render('select');
}
}
})
@@ -1785,7 +1947,7 @@
});
}
}
-
+
// 鍚屾瀛愯〃SN鐮佸埌琛ㄥご
function syncSubTableToHeader() {
var tableData = table.cache['mainTable'];
@@ -1952,10 +2114,18 @@
}
option.cols[0][i + 1]["fixed"] = "left";
}
- }
+ }
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);
+ }
+
} else {
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);
+ }
+
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1973,7 +2143,17 @@
//}
}
});
-
+ //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
+ form.on('select(HAnalysisMethod)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
//琛岄�夋嫨澶勭悊锛堟楠岃褰�1锛�
form.on('select(HQCNote1)', function (data) {
//鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
--
Gitblit v1.9.1