From 21c5f34f308c293c30b0dacf8bf8025937568f39 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 23 二月 2024 16:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index 6d380c8..3b3806c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -68,6 +68,10 @@
.layui-form-label {
width: 25%;
}
+ /*鏄庣粏琛屽閫夋灞呬腑*/
+ .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+ margin-left: 35%;
+ }
</style>
</head>
@@ -257,11 +261,15 @@
</div>
</div>
<!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
- <script type="text/html" id="HDotCheckResult">
+ <!--<script type="text/html" id="HDotCheckResult">
<select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" style="height:30px;">
<option value="OK">OK</option>
<option value="NG">NG</option>
</select>
+ </script>-->
+ <!--澶嶉�夋锛堢偣妫�缁撴灉锛�-->
+ <script type="text/html" id="HDotCheckResult">
+ <input type="checkbox" value="{{d.HDotCheckResult}}" lay-skin="primary" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HDotCheckResult" {{ d.HDotCheckResult == 1 ? 'checked' : '' }}>
</script>
<script>
layui.config({
@@ -365,13 +373,25 @@
});
//琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級
- form.on('select(HDotCheckResult)', function (data) {
+ //form.on('select(HDotCheckResult)', 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.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ // }
+ // });
+ //});
+
+ //鏄惁鍚堟牸
+ form.on('checkbox(HDotCheckResult)', 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.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ value.HDotCheckResult = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
});
@@ -386,7 +406,7 @@
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
});
- })
+ })
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
@@ -605,7 +625,7 @@
}
};
- option.data = [{ "HDotCheckResult": "OK", "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "","HRemark":"" }];
+ option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
table.render(option);
}
//澧炲姞涓�琛�
@@ -713,7 +733,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetItemByEquipFile",
type: "GET",
- data: { "EquipProjectID": $("#HEquipID").val(),"Type":"DJ" },
+ data: { "EquipProjectID": $("#HEquipID").val(), "Type": "DJ" },
success: function (result) {
var data = result.data;
$("#HEquipDotCheckRuleInterID").val(data[0].鐐规瑙勭▼ID);
@@ -722,7 +742,7 @@
for (let i = 0; i < data.length; i++) {
rowdata.push(
{
- "HDotCheckResult": "OK", "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": data[i].鐐规椤圭洰鍚嶇О,
+ "HDotCheckResult": data[i].榛樿缁撹, "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": data[i].鐐规椤圭洰鍚嶇О,
"HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�,
"HManagerName": data[i].璐熻矗浜哄悕绉�
}
--
Gitblit v1.9.1