From 77dafdec8a67e456ec1ee88ae556882be2dc774c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 七月 2024 09:37:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 92 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 76 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 97bd18b..ad94ecd 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -145,6 +145,13 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏈�缁堢粨璁�</label>
+ <div class="layui-input-inline">
+ <input type="radio" name="HLastResult" id="HLastResult" value="OK" title="OK" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="NG" title="NG">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -311,6 +318,35 @@
table.on('tool(mainTable1)', function (obj) {
set_GridDelete1(obj); //琛屽唴鍒犻櫎
set_GridCellCheck1(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+
+ //琛岄�夋嫨澶勭悊锛堢偣妫�缁撴灉锛�
+ form.on('select(HMaintainResult)', 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.HMaintainResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+
+ console.log(table.cache['mainTable']);
+
+ var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+ for (let i = 0; i < table.cache['mainTable'].length; i++) {
+ if (table.cache['mainTable'][i].HMaintainResult == "X") {
+ HQty++;
+ }
+ }
+ if (HQty > 0) {
+ document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ } else {
+ document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ }
+ form.render('radio');
});
//琛ㄥご淇℃伅璁惧寮圭獥
@@ -512,9 +548,11 @@
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ option.data = buttonArr;
+ table.render(option);
+ //table.reload("mainTable", {
+ // data: option.data //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
}
@@ -531,9 +569,11 @@
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- table.reload("mainTable1", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ option1.data = buttonArr;
+ table.render(option1);
+ //table.reload("mainTable1", {
+ // data: option1.data //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
}
} else {
@@ -890,6 +930,15 @@
, "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
});
+ if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
+ document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ } else {
+ document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ }
+ form.render('radio');
+
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -911,12 +960,19 @@
//console.log('gouba' + result);
if (result.count == 1) {
option.data = result.list[0];
+ for (let i = 0; i < option.data.length; i++) {
+ if (option.data[i].HMaintainResult == "鍚堟牸") {
+ option.data[i].HMaintainResult = "Y";
+ } else {
+ option.data[i].HMaintainResult = "X";
+ }
+ }
table.render(option);
option1.data = result.list[1];
table.render(option1);
- for (let j = 0; j < result.list.length; j++) {
- $("#HMaintainResult" + (j + 1)).val(result.list[j].淇濆吇缁撴灉 == "鍚堟牸" ? 'Y' : 'X')
+ for (let j = 0; j < result.list[0].length; j++) {
+ $("#HMaintainResult" + (j + 1)).val(result.list[0][j].HMaintainResult == "鍚堟牸" ? 'Y' : (result.list[0][j].HMaintainResult == 'Y' ? 'Y' : 'X'))
}
form.render('select');
} else {
@@ -942,15 +998,14 @@
}
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
- 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++) {
+ $('#HMaintainResult' + i + '').find("option[value='" + option.data[i - 1].HMaintainResult + "']").attr("selected", true);
}
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ form.render('select');
}
//澧炲姞涓�琛�1
function btnAddLine1(NewRow) {
@@ -979,6 +1034,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++) {
+ $('#HMaintainResult' + i + '').find("option[value='" + option.data[i - 1].HMaintainResult + "']").attr("selected", true);
+ }
+ form.render('select');
}
}
//澶嶅埗涓�琛�1
--
Gitblit v1.9.1