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 | 786 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 708 insertions(+), 78 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 760bfa6..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"
@@ -12,10 +12,20 @@
.layui-form-label {
width: 85px;
}
+
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
</style>
</head>
<body>
-
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
@@ -47,7 +57,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏂规鍚嶇О</label>
+ <label class="layui-form-label">鏂规鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HName" id="HName" class="layui-input">
</div>
@@ -103,9 +113,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">榛樿鏂规</label>
+ <label class="layui-form-label">鎶芥牱鏂规</label>
<div class="layui-input-inline">
- <input type="checkbox" name="HStandard" id="HStandard" lay-skin="primary" title="" checked="">
+ <input type="text" name="HSampleSchemeName" id="HSampleSchemeName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSampleSchemeID" id="HSampleSchemeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSampleSchemeList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
@@ -133,25 +147,33 @@
</div>
</div>
</div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">榛樿鏂规</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStandard" id="HStandard" lay-skin="primary" title="" checked="">
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
</div>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- </div>
- </div>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
</div>
- </script>
+ </script>
<script type="text/html" id="xuhao">
{{d.LAY_TABLE_INDEX+1}}
</script>
-
+
</form>
</div>
</div>
@@ -161,6 +183,40 @@
<!--<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="1">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(缂洪櫡绛夌骇)-->
+ <script type="text/html" id="HDefectLevel">
+ <select name="HDefectLevel" lay-filter="HDefectLevel" id="HDefectLevel{{d.LAY_TABLE_INDEX+1}}">
+ <option value="1">鑷村懡缂洪櫡</option>
+ <option value="2">閲嶇己闄�</option>
+ <option value="3">杞荤己闄�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鐘舵��)-->
+ <script type="text/html" id="HStatus">
+ <select name="HStatus" lay-filter="HStatus" id="HStatus{{d.LAY_TABLE_INDEX+1}}">
+ <option value="0">涓嶅悎鏍�</option>
+ <option value="1" selected>鍚堟牸</option>
+ </select>
+ </script>
+ <!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
+ <script type="text/html" id="HKeyInspect">
+ <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
+ </script>
+
+ <!--澶嶉�夋锛堢牬鍧忔�ф楠岋級-->
+ <script type="text/html" id="HDestructInspect">
+ <input type="checkbox" value="{{d.HDestructInspect}}" lay-skin="primary" id="HDestructInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HDestructInspect" {{ d.HDestructInspect == 1 ? 'checked' : '' }}>
+ </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>
@@ -193,14 +249,12 @@
, element = layui.element;
var option;
var sBillType = "3320";
- //var TabRow = { "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": "" };
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -221,7 +275,17 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": "" };
+ var NewRow = {
+ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
+ , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
+ , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
+ , "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) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -238,6 +302,7 @@
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
});
+ //#region 鍩虹璧勬枡鏀惧ぇ闀滄寜閽�
//琛ㄥご寮圭獥鐗╂枡淇℃伅
form.on('submit(HMaterList)', function () {
@@ -382,6 +447,43 @@
});
});
+ //琛ㄥご鎶芥牱鏂规淇℃伅
+ form.on('submit(HSampleSchemeList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶芥牱鏂规鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSampleSchemeName").val(checkStatus.data[0].鎶芥牱鏂规鍚嶇О);
+ $("#HSampleSchemeID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//琛ㄥご鍗曚綅鍗曚綅
form.on('submit(HUnitList)', function () {//閫夋嫨鍗曚綅
//椤甸潰灞�-鑷畾涔�
@@ -419,12 +521,94 @@
}
});
});
+ //#endregion
+
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ //debugger;
+ Saver(data);
+ });
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {//
+ if (typeof (params[params[0]]) == "undefined") {
+ Pub_Close(2);
+ } else {
+ Pub_Close(1);
+ }
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+
+ //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
+ 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鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堢己闄风瓑绾э級
+ form.on('select(HDefectLevel)', 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.HDefectLevel = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+ form.on('select(HStatus)', 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.HStatus = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //鏄惁閲嶇偣妫�鏌�
+ form.on('checkbox(HKeyInspect)', 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.HKeyInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //鏄惁鐮村潖鎬ф楠�
+ form.on('checkbox(HDestructInspect)', 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.HDestructInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏄惁榛樿鏂规
+ form.on('checkbox(HStandard)', function (data) {
+ $("#HStandard").val(data.elem.checked);
+ });
+ //#endregion
+
+ //#region 褰撳墠椤甸潰鎵�鏈夋柟娉�
//琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- if (obj.event === 'HQCCheckItemNumber') //淇濆吇椤圭洰淇℃伅
+ if (obj.event === 'HQCCheckItemNumber') //
{
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -464,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", {
@@ -473,7 +661,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
-
+
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -483,6 +671,204 @@
}
});
}
+ if (obj.event === 'HQualityStdName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ㄩ噺鏍囧噯鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QualityStd.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HQualityStdID: checkStatus.data[0].HItemID,
+ HQualityStdName: checkStatus.data[0].璐ㄩ噺鏍囧噯鍚嶇О,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ 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', '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 () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectInstruMentName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼华鍣ㄥ垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectInstruMentID: checkStatus.data[0].HItemID,
+ HInspectInstruMentName: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�,
+ HQCTool: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectBasisName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼緷鎹垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectBasis.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectBasisID: checkStatus.data[0].HItemID,
+ HInspectBasisName: checkStatus.data[0].妫�楠屼緷鎹悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HSampleSchemeName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶芥牱鏂规鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HSampleSchemeID: checkStatus.data[0].hmainid,
+ HSampleSchemeName: checkStatus.data[0].鎶芥牱鏂规鍚嶇О,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+
obj.event = "";
return false;
@@ -490,9 +876,85 @@
})
}
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HPrjNo', title: '娆″簭鍙�', edit: 'text', hide: true }
+ , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
+ , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩唬鐮�*', edit: 'text', event: 'HQCCheckItemNumber' }
+ , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text' }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+ , { field: 'HQCStdMax', title: '鏈�澶ф楠屾爣鍑�', edit: 'text' }
+ , { field: 'HQCUnit', title: '妫�楠屽崟浣�', edit: 'text' }
+
+ , { field: 'HQCTool', title: '妫�楠屽伐鍏凤紙浠櫒锛�', edit: 'text' }
+ , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod' }
+ , { field: 'HDefectLevel', title: '缂洪櫡绛夌骇', templet: '#HDefectLevel' }
+ , { field: 'HDestructInspect', title: '鐮村潖鎬ф楠�', templet: '#HDestructInspect', unresize: false }
+ , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
+ , { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
+ , { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
+ , { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectInstruMentID', title: '妫�楠屼华鍣↖D', edit: 'text', hide: true }
+ , { field: 'HInspectInstruMentName', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentName' }
+ , { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
+ , { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
+ , { field: 'HSampleSchemeID', title: '鎶芥牱鏂规ID', edit: 'text', hide: true }
+ , { field: 'HSampleSchemeName', title: '鎶芥牱鏂规', edit: 'text', event: 'HSampleSchemeName' }
+ , { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }
+ , { field: 'HCompareSymbol', title: '姣旇緝绗�', edit: 'text' }
+ , { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text' }
+ , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text' }
+ , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text' }
+ , { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text' }
+ , { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text' }
+ , { field: 'HTargetValKey', title: '鐩爣鍊糑ey', edit: 'text' }
+ , { field: 'HUpLimitKey', title: '涓婇檺鍊糑ey', edit: 'text' }
+ , { field: 'HDownLimitKey', title: '涓嬮檺鍊糑ey', edit: 'text' }
+ , { field: 'HUpOffSetKey', title: '涓婂亸宸甂ey', edit: 'text' }
+ , { field: 'HDownOffSetKey', title: '涓嬪亸宸甂ey', edit: 'text' }
+ , { field: 'HTargetValQ', title: '鐩爣鍊兼暟閲�', edit: 'text' }
+ , { field: 'HUpLimitQ', title: '涓婇檺鍊兼暟閲�', edit: 'text' }
+ , { field: 'HDownLimitQ', title: '涓嬮檺鍊兼暟閲�', edit: 'text' }
+ , { field: 'HUpOffSetQ', title: '涓婂亸宸暟閲�', edit: 'text' }
+ , { field: 'HDownOffSetQ', title: '涓嬪亸宸暟閲�', edit: 'text' }
+ , { field: 'HTargetValB', title: '鐩爣鍊煎熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HUpLimitB', title: '涓婇檺鍊煎熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HDownLimitB', title: '涓嬮檺鍊煎熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HUpOffSetB', title: '涓婂亸宸熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HDownOffSetB', title: '涓嬪亸宸熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HTargetValTxt', title: '鐩爣鍊兼枃鏈�', edit: 'text' }
+ , { field: 'HUpLimitTxt', title: '涓婇檺鍊兼枃鏈�', edit: 'text' }
+ , { 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' }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , page: false
+ , cellMinWidth: 120
+ , height: 500
+ , limit: 100
+ , cols: [columns]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ }
+
//淇濆瓨
- form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
+ function Saver(data) {
var isEndCheck = document.getElementById("HStandard").checked;
data.field.HStandard = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
var sMainStr = JSON.stringify(data.field);
@@ -526,56 +988,23 @@
layer.alert("閿欒:" + err, { icon: 5 });
}
});
- });
-
- //閫�鍑�
- form.on('submit(Exit)', function (data) {//
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- });
-
-
- //#endregion
-
- //#region 褰撳墠椤甸潰鎵�鏈夋柟娉�
- //鍒濆鍖栬〃鏍�
- function set_InitGrid() {
- //琛ㄥご
- columns = [
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- , { field: 'HPrjNo', title: '娆″簭鍙�', edit: 'text', hide: true }
- , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
- , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩唬鐮�', edit: 'text', event: 'HQCCheckItemNumber' }
- , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text' }
- , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
- , { field: 'HQCStdMax', title: '鏈�澶ф楠屾爣鍑�', edit: 'text' }
- , { field: 'HQCUnit', title: '妫�楠屽崟浣�', edit: 'text' }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
- ];
- option = {
- id: 'mainTable'
- , elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , page: false
- , cellMinWidth: 120
- , height: 500
- , limit:100
- , cols: [columns]
- , done: function (res, curr, count) {
-
- }
- };
-
}
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [];
+ option.data = [{
+ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
+ , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
+ , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
+ , "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);
}
@@ -583,7 +1012,17 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": "" }];
+ option.data = [{
+ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
+ , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
+ , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
+ , "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);
}
@@ -619,8 +1058,17 @@
success: function (result) {
console.log(result);
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Gy_QCCheckProjectList_NEW[0];
- $("input[name='HStandard']").prop("checked", data.HStandard);//true:閫変腑 false:涓嶉�変腑
+ var data = result.data.h_v_Gy_QCCheckProjectList_Edit[0];
+
+ //$("input[name='HStandard']").prop("checked", data.榛樿鏂规 == 0 ? false : true);//true:閫変腑 false:涓嶉�変腑
+
+ if (data.榛樿鏂规 == 1) {
+ $("input[name='HStandard']").prop("checked", true);
+ }
+ else {
+ $("input[name='HStandard']").prop("checked", false);
+ }
+
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
form.val("component-form-group", {
"HBillNo": data.鍗曟嵁鍙�
@@ -640,6 +1088,9 @@
, "HUnitID": data.HUnitID
, "HUnitNumber": data.鍗曚綅浠ｇ爜
, "HRemark": data.琛ㄥご澶囨敞
+ , "HSampleSchemeName": data.鎶芥牱鏂规鍚嶇О
+ , "HSampleSchemeID": data.HSampleSchemeID
+ , "HStandard": data.榛樿鏂规 == 1 ? true : false
});
@@ -675,8 +1126,112 @@
data: { "HInterID": linterid },
success: function (result) {
if (result.count == 1) {
- option.data = result.data;
+
+ var rowarr = [];
+ var data = result.data;
+ for (var 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;
+ }
+ switch (data[i].缂洪櫡绛夌骇) {
+ case "鑷村懡缂洪櫡":
+ data[i].缂洪櫡绛夌骇 = "1";
+ break;
+ case "閲嶇己闄�":
+ data[i].缂洪櫡绛夌骇 = "2";
+ break;
+ case "杞荤己闄�":
+ data[i].缂洪櫡绛夌骇 = "3";
+ break;
+ }
+ switch (data[i].鐘舵��) {
+ case "鍚堟牸":
+ data[i].鐘舵�� = "1";
+ break;
+ case "涓嶅悎鏍�":
+ data[i].鐘舵�� = "0";
+ break;
+ }
+
+ rowarr.push({
+ "HPrjNo": (i + 1), "HQCCheckItemID": data[i].妫�楠岄」鐩甀D, "HQCCheckItemNumber": data[i].妫�楠岄」鐩唬鐮�,
+ "HQCCheckItemName": data[i].妫�楠岄」鐩�, "HQCStd": data[i].妫�楠屾爣鍑�, "HQCStdMax": data[i].鏈�澶ф楠屾爣鍑�,
+ "HQCUnit": data[i].妫�楠屽崟浣�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HQCTool": data[i].妫�楠屽伐鍏�,
+ "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶, "HDefectLevel": data[i].缂洪櫡绛夌骇, "HDestructInspect": data[i].鐮村潖鎬ф楠� == 0 ? false : true,
+ "HKeyInspect": data[i].閲嶇偣妫�鏌� == 0 ? false : true, "HQualityStdID": data[i].HQualityStdID, "HInspectMethodID": data[i].HInspectMethodID,
+ "HInspectInstruMentID": data[i].HInspectInstruMentID, "HInspectBasisID": data[i].HInspectBasisID,
+ "HSampleSchemeID": data[i].HSampleSchemeID_sub, "HStatus": data[i].鐘舵��, "HCompareSymbol": data[i].姣旇緝绗�,
+ "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�,
+ "HDownOffSet": data[i].涓嬪亸宸�, "HTargetValKey": data[i].鐩爣鍊糑ey, "HUpLimitKey": data[i].涓婇檺鍊糑ey,
+ "HDownLimitKey": data[i].涓嬮檺鍊糑ey, "HUpOffSetKey": data[i].涓婂亸宸甂ey, "HDownOffSetKey": data[i].涓嬪亸宸甂ey,
+ "HTargetValQ": data[i].鐩爣鍊兼暟閲�, "HUpLimitQ": data[i].涓婇檺鍊兼暟閲�, "HDownLimitQ": data[i].涓嬮檺鍊兼暟閲�,
+ "HUpOffSetQ": data[i].涓婂亸宸暟閲�, "HDownOffSetQ": data[i].涓嬪亸宸暟閲�, "HTargetValB": data[i].鐩爣鍊煎熀纭�璧勬枡,
+ "HUpLimitB": data[i].涓婇檺鍊煎熀纭�璧勬枡, "HDownLimitB": data[i].涓嬮檺鍊煎熀纭�璧勬枡, "HUpOffSetB": data[i].涓婂亸宸熀纭�璧勬枡,
+ "HDownOffSetB": data[i].涓嬪亸宸熀纭�璧勬枡, "HTargetValTxt": data[i].鐩爣鍊兼枃鏈�, "HUpLimitTxt": data[i].涓婇檺鍊兼枃鏈�,
+ "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].鎺у埗涓嬮檺
+ });
+ }
+
+ option.data = rowarr;
table.render(option);
+
+ for (var i = 1; i <= 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;
+ }
+ switch (data[(i - 1)].缂洪櫡绛夌骇) {
+ case "鑷村懡缂洪櫡":
+ data[(i - 1)].缂洪櫡绛夌骇 = "1";
+ break;
+ case "閲嶇己闄�":
+ data[(i - 1)].缂洪櫡绛夌骇 = "2";
+ break;
+ case "杞荤己闄�":
+ data[(i - 1)].缂洪櫡绛夌骇 = "3";
+ break;
+ }
+ switch (data[(i - 1)].鐘舵��) {
+ case "鍚堟牸":
+ data[(i - 1)].鐘舵�� = "1";
+ break;
+ case "涓嶅悎鏍�":
+ data[(i - 1)].鐘舵�� = "0";
+ break;
+ }
+
+ $('#HAnalysisMethod' + i + '').find("option[value='" + (data[(i - 1)].鍒嗘瀽鏂规硶) + "']").attr("selected", true);
+ $('#HDefectLevel' + i + '').find("option[value='" + (data[(i - 1)].缂洪櫡绛夌骇) + "']").attr("selected", true);
+ $('#HStatus' + i + '').find("option[value='" + (data[(i - 1)].鐘舵��) + "']").attr("selected", true);
+
+ if (data[(i - 1)].鐮村潖鎬ф楠�) {
+ $('#HDestructInspect' + (i)).attr("checked", true);
+ }
+ if (data[(i - 1)].閲嶇偣妫�鏌�) {
+ $('#HKeyInspect' + (i)).attr("checked", true);
+ }
+ }
+
+ form.render("select");
+ form.render("checkbox");
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -690,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');
}
//澶嶅埗涓�琛�
@@ -719,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');
}
}
@@ -742,6 +1316,62 @@
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
var Result = true;
+ var HName = $("#HName").val(); //鏂规鍚嶇О
+
+ if (HName == null || HName == undefined || HName == "") {
+ layer.msg("璇疯緭鍏ユ柟妗堝悕绉帮紒", { icon: 5 });
+ return false;
+ }
+
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ var sSubStr = table.cache['mainTable'];
+
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (!ref.test(sSubStr[i].HTargetValQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 鐩爣鍊兼暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpLimitQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婇檺鍊兼暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownLimitQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬮檺鍊兼暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpOffSetQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婂亸宸暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownOffSetQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬪亸宸暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HTargetValB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 鐩爣鍊煎熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpLimitB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婇檺鍊煎熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownLimitB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬮檺鍊煎熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpOffSetB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婂亸宸熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownOffSetB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬪亸宸熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr[i].HQCCheckItemID == 0 || sSubStr[i].HQCCheckItemID == null || sSubStr[i].HQCCheckItemID == undefined) {
+ layer.msg("绗�" + (i + 1) + "琛� 妫�楠岄」鐩负绌猴紝璇烽�夋嫨妫�楠岄」鐩�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ }
return Result;
}
//#endregion
--
Gitblit v1.9.1