From 93c387d8d0a14be06a134c77cc2e48d5d32c95bf Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 01 七月 2024 16:26:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 101 insertions(+), 19 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
index a229d0f..0f48b5b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
@@ -12,6 +12,17 @@
.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>
@@ -76,7 +87,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -110,7 +121,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -124,7 +135,14 @@
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
</div>
- </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>
@@ -179,6 +197,14 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
</script>
+ <!--琛屼笅鎷夐�夋嫨(淇濆吇缁撴灉)-->
+ <script type="text/html" id="HMaintainResult">
+ <select name="HMaintainResult" lay-filter="HMaintainResult" id="HMaintainResult{{d.LAY_TABLE_INDEX+1}}">
+ <!--<option value="">璇烽�夋嫨</option>-->
+ <option value="Y" selected>Y</option>
+ <option value="X">X</option>
+ </select>
+ </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>
@@ -213,7 +239,7 @@
var option;
var option2;
var sBillType = "3807";
- var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+ var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" };
var TabRow1 = { "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " };
//#endregion
@@ -257,7 +283,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+ var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -295,6 +321,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');
});
//琛ㄥご淇℃伅淇濆吇璁″垝婧愬崟寮圭獥
@@ -483,7 +538,7 @@
var PJData = result.list[1];//閰嶄欢
var rowdate1 = layui.table.cache["mainTable"];
var rowdate2 = layui.table.cache["mainTable1"];
- option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y"}];
option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
table.render(option);
table.render(option2);
@@ -498,7 +553,7 @@
var checkrow = {
"HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
"HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
- "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
+ "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark, "HMaintainResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -549,7 +604,7 @@
var PJData = result.data[1];//閰嶄欢
var rowdate1 = layui.table.cache["mainTable"];
var rowdate2 = layui.table.cache["mainTable1"];
- option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" }];
option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
table.render(option);
table.render(option2);
@@ -571,7 +626,7 @@
var checkrow = {
"HMaintainItemID": BYData[i].HMaintainItemID == null ? 0 : BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰,
"HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].HEmployeeID == null ? 0 : BYData[i].HEmployeeID, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
- "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": ""
+ "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": "", "HMaintainResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -620,7 +675,7 @@
var PJData = result.list[1];//閰嶄欢
var rowdate1 = layui.table.cache["mainTable"];
var rowdate2 = layui.table.cache["mainTable1"];
- option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" }];
option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
table.render(option);
table.render(option2);
@@ -632,13 +687,12 @@
var checkrow = {
"HMaintainItemID": BYData[i].淇濆吇椤圭洰ID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰,
"HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
- "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": BYData[i].瀛愬娉�2
+ "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": BYData[i].瀛愬娉�2, "HMaintainResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ option.data = buttonArr;
+ table.render(option);
}
@@ -655,9 +709,8 @@
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- table.reload("mainTable1", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ option2.data = buttonArr;
+ table.render(option2);
}
} else {
@@ -949,6 +1002,7 @@
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
, { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: 'HMaintainItemNumber' }
, { field: 'HMaintainItem', title: '淇濆吇椤圭洰' }
+ , { field: 'HMaintainResult', title: '淇濆吇缁撴灉', templet: '#HMaintainResult', event: 'HMaintainResult' }
, { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
@@ -1009,7 +1063,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" }];
option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
table.render(option);
table.render(option2);
@@ -1076,7 +1130,14 @@
, "HMaintainLevID": data.HMaintainLevID
, "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' });
}
@@ -1110,10 +1171,21 @@
success: function (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);
option2.data = result.list[1];
table.render(option2);
+ 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 {
layer.alert(result.code + result.Message, { icon: 5 });
}
@@ -1129,6 +1201,11 @@
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);
+ }
+ form.render('select');
}
//澧炲姞涓�琛�
@@ -1153,6 +1230,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');
}
}
--
Gitblit v1.9.1