From da5e86bccd56e650668daf98b7ebff70cca0d5ab Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 25 七月 2024 13:07:22 +0800
Subject: [PATCH] 新增设备维修签到单单据
---
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 201 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 177 insertions(+), 24 deletions(-)
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
index b385c4f..0828e60 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
@@ -177,6 +177,30 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妯″叿缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMouldNumber" name="HMouldNumber" id="HMouldNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMouldID" id="HMouldID" lay-verify="HMouldID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMould" id="btnSearchHMould" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">妯″叿鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMouldName" lay-verify="HMouldName" id="HMouldName" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">妯″叿鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMouldModel" lay-verify="HMouldModel" id="HMouldModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" style=" width: 500px;">
@@ -311,7 +335,21 @@
</div>
</div>
</div>
-
+ <!--閫夋嫨妗�-->
+ <script type="text/html" id="HDataForm-select">
+ <select name="HDataForm" lay-filter="HDataForm" id="HDataForm{{d.LAY_TABLE_INDEX+1}}">
+ <option value="璁惧閲囬泦" selected>璁惧閲囬泦</option>
+ <option value="鎵嬪姩杈撳叆">鎵嬪姩杈撳叆</option>
+ <option value="鏂囦欢寮曞叆">鏂囦欢寮曞叆</option>
+ </select>
+ </script>
+ <script type="text/html" id="HDataUnit-select">
+ <select name="HDataUnit" lay-filter="HDataUnit" id="HDataUnit{{d.LAY_TABLE_INDEX+1}}">
+ <option value="绉�" selected>绉�</option>
+ <option value="鍒�">鍒�</option>
+ <option value="鏃�">鏃�</option>
+ </select>
+ </script>
<script type="text/html" id="barDemo">
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
@@ -395,7 +433,7 @@
//绂佺敤鎸夐挳
var num = 1;
HfBtn(num);
-
+ debugger;
//鍒濆鍖栬〃鏍�
get_InitGrid();
@@ -407,7 +445,7 @@
//鏄剧ず鍒楁暟鎹�
- DisPlay_HideColumn();
+ /*DisPlay_HideColumn();*/
//#endregion
@@ -447,7 +485,13 @@
get_checkSearchHProc();
});
//#endregion
-
+
+ //#region 閫夋嫨妯″叿鎸夐挳
+ form.on('submit(btnSearchHMould)', function () {
+ get_checkSearchHMould();
+ });
+ //#endregion
+
// 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
@@ -484,6 +528,30 @@
set_CancelCloseBills(1);
});
+ //#region 琛ㄦ牸琛岄�夋嫨澶勭悊
+ form.on('select(HDataForm)', 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.HDataForm = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ form.on('select(HDataUnit)', function (data) {
+ console.log(table.cache["mainTable"])
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ 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.HDataUnit = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //#endregion
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
@@ -491,14 +559,17 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HTechParamID": "",
+ "HTechParamID": 0,
"HTechParamNumber": "",
"HTechParamName": "",
- "HTechParamUnitID": "",
+ "HTechParamUnitID": 0,
"HTechParamUnitName": "",
"HStd": "0",
"HMax": "0",
"HMin": "0",
+ "HDataForm": "璁惧閲囬泦",
+ "HDataUnit": "绉�",
+ "HDataTimes": "0",
"HSourceBillNo": "0",
"HSourceBillType": "0",
"HSourceEntryID": "0",
@@ -508,9 +579,12 @@
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
-
table.render(option);
-
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HDataUnit' + i + '').find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true);
+ $('#HDataForm' + i + '').find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true);
+ }
+ form.render('select');
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -526,7 +600,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++) {
+ $('#HDataUnit' + i + '').find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true);
+ $('#HDataForm' + i + '').find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true);
+ }
+ form.render('select');
}
break;
@@ -580,6 +658,9 @@
, { field: 'HStd', title: '鏍囧噯鍊�', edit: 'text', totalRow: true }
, { field: 'HMax', title: '涓婇檺', edit: 'text', totalRow: true }
, { field: 'HMin', title: '涓嬮檺', edit: 'text', totalRow: true }
+ , { field: 'HDataForm', title: '閲囬泦鏉ユ簮', templet: '#HDataForm-select' }
+ , { field: 'HDataUnit', title: '閲囬泦鏃堕棿鍗曚綅', templet: '#HDataUnit-select' }
+ , { field: 'HDataTimes', title: '閲囬泦鍛ㄦ湡棰戠巼', edit: 'text', totalRow: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
}
@@ -796,17 +877,44 @@
}
//#endregion
+ //#region 妯″叿閫夋嫨椤甸潰
+ function get_checkSearchHMould() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMouldID").val(checkStatus.data[0].hmainid);
+ $("#HMouldNumber").val(checkStatus.data[0].妯″叿缂栧彿);
+ $("#HMouldName").val(checkStatus.data[0].妯″叿鍚嶇О);
+ $("#HMouldModel").val(checkStatus.data[0].妯″叿鍨嬪彿);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
//#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
//宸ヨ壓鍙傛暟
if (obj.event == "HTechParamNumber") {
- //鎵撳紑鍣ㄥ叿绠＄悊灏忕獥浣�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '妯″叿鍒楄〃',
+ title: '宸ヨ壓鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
@@ -820,12 +928,47 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- obj.update({
- "HTechParamID": checkStatus.data[0].HItemID,
- "HTechParamNumber": checkStatus.data[0].宸ヨ壓鍙傛暟浠ｇ爜,
- "HTechParamName": checkStatus.data[0].宸ヨ壓鍙傛暟鍚嶇О,
-
- });
+
+ table.cache["mainTable"].splice(0, 1);
+ for (var rowData of checkStatus.data) {
+ var NewRow = {
+ "HTechParamID": rowData.HItemID,
+ "HTechParamNumber": rowData.宸ヨ壓鍙傛暟浠ｇ爜,
+ "HTechParamName": rowData.宸ヨ壓鍙傛暟鍚嶇О,
+ "HTechParamUnitID": 0,
+ "HTechParamUnitName": "",
+ "HStd": "0",
+ "HMax": "0",
+ "HMin": "0",
+ "HDataForm": "鎵嬪伐褰曞叆",
+ "HDataUnit": "绉�",
+ "HDataTimes": "0",
+ "HSourceBillNo": "0",
+ "HSourceBillType": "0",
+ "HSourceEntryID": "0",
+ "HSourceInterID": "0"
+ };
+ table.cache["mainTable"].push(NewRow);
+ }
+ option.data = table.cache["mainTable"];
+ table.render(option);
+
+ //for (var i = 0; i < checkStatus.data.length; i++) {
+ // option.data.push({
+ // "HTechParamID": checkStatus.data[i].HItemID,
+ // "HTechParamNumber": checkStatus.data[i].宸ヨ壓鍙傛暟浠ｇ爜,
+ // "HTechParamName": checkStatus.data[i].宸ヨ壓鍙傛暟鍚嶇О,
+ // })
+ //}
+
+
+ //obj.update({
+ // "HTechParamID": checkStatus.data[0].HItemID,
+ // "HTechParamNumber": checkStatus.data[0].宸ヨ壓鍙傛暟浠ｇ爜,
+ // "HTechParamName": checkStatus.data[0].宸ヨ壓鍙傛暟鍚嶇О,
+
+ //});
+ //table.render(option);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, end: function () {
@@ -915,6 +1058,11 @@
oldData.splice(obj.tr.data('index'), 1)
option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HDataUnit' + i).find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true).trigger("change");;
+ $('#HDataForm' + i).find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true).trigger("change");;
+ }
+ form.render('select');
layer.close(index);
}
});
@@ -1034,6 +1182,7 @@
//#region 缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
+
$.ajax({
url: GetWEBURL() + "Gy_MaterialTechParamBill/Gy_MaterialTechParamBillMainEditList",
async: false,
@@ -1058,6 +1207,10 @@
, "HEquipNumber": tableMain[0]["璁惧浠ｇ爜"]
, "HEquipName": tableMain[0]["璁惧鍚嶇О"]
, "HEquipModel": tableMain[0]["璁惧鍨嬪彿"]
+ , "HMouldID": tableMain[0]["HMouldID"]
+ , "HMouldNumber": tableMain[0]["妯″叿浠ｇ爜"]
+ , "HMouldName": tableMain[0]["妯″叿鍚嶇О"]
+ , "HMouldModel": tableMain[0]["妯″叿鍨嬪彿"]
, "HDeptID": tableMain[0]["HDeptID"]
, "HDeptName": tableMain[0]["閮ㄩ棬"]
, "HWorkCenterID": tableMain[0]["HWorkCenterID"]
@@ -1068,9 +1221,6 @@
, "HEmpName": tableMain[0]["璐熻矗浜�"]
, "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
, "HOrgID": tableMain[0].HOrgID
-
-
-
, "HMaker": tableMain[0]["鍒跺崟浜�"]
, "HUpDater": tableMain[0]["淇敼浜�"]
, "HChecker": tableMain[0]["瀹℃牳浜�"]
@@ -1080,12 +1230,15 @@
, "HCloseMan": tableMain[0]["鍏抽棴浜�"]
, "HCloseDate": tableMain[0]["鍏抽棴鏃堕棿"] == null ? "" : Format(new Date(tableMain[0]["鍏抽棴鏃堕棿"]), "yyyy-MM-dd")
});
-
//瀛愯〃 璧嬪��
-
option.data = tableSub;
+ console.log(tableSub)
table.render(option);
-
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HDataUnit' + i).find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true).trigger("change");;
+ $('#HDataForm' + i).find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true).trigger("change");;
+ }
+ form.render('select');
form.render('checkbox');
}
}
@@ -1362,7 +1515,7 @@
OptionData = obj;
}
-
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1