From 24efc0b0d99502afdebb6ef678b0cf4e91dcb084 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 16 五月 2025 15:49:51 +0800
Subject: [PATCH] 组织物料启动检查项目防错装置优化
---
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 102 ++++++++++++++++++++++++++++----------------------
1 files changed, 57 insertions(+), 45 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 967f337..255a772 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"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>浜у搧鍣ㄥ叿娓呭崟</title>
+ <title>浜у搧宸ヨ壓鍙傛暟娓呭崟</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -350,6 +350,12 @@
<option value="鏃�">鏃�</option>
</select>
</script>
+ <!--澶嶉�夋 鏄惁蹇呭綍鎺у埗-->
+ <script type="text/html" id="HIsRequired">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HIsRequired" lay-filter="HIsRequired" id="HIsRequired{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
<script type="text/html" id="barDemo">
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
@@ -413,27 +419,27 @@
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
}
- //else if (OperationType == 2) {
-
- // RoadBillMain(linterid);
- // $.ajax({
- // url: GetWEBURL() + "/Web/GetMAXNum",
- // type: "GET",
- // async: false,
- // data: { "HBillType": '3301' },
- // success: function (d) {
- // $("#HInterID").val(d.data[0].HInterID);
- // $("#HBillNo").val(d.data[0].HBillNo);
- // $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- // }
- // });
- //}
+ else if (OperationType == 2) {
+ //鍒濆鍖栬〃鏍�
+ get_InitGrid();
+ RoadBillMain(linterid);
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3334' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ });
+ }
else if (OperationType == 3) {
//绂佺敤鎸夐挳
var num = 1;
HfBtn(num);
- debugger;
//鍒濆鍖栬〃鏍�
get_InitGrid();
@@ -550,6 +556,17 @@
}
});
});
+ //鏄惁 蹇呭綍鎺у埗
+ form.on('checkbox(HIsRequired)', 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.HIsRequired = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
//#endregion
//澶村伐鍏锋爮浜嬩欢
@@ -569,11 +586,12 @@
"HMin": "0",
"HDataForm": "璁惧閲囬泦",
"HDataUnit": "绉�",
+ "HIsRequired": false,
"HDataTimes": "0",
"HTechParamClassID": "0",
"HSNO": "0",
"HStdNextTimes": "0",
- "HTechParamIDStd":"0",
+ "HTechParamIDStd": "0",
"HSourceBillNo": "0",
"HSourceBillType": "0",
"HSourceEntryID": "0",
@@ -587,8 +605,12 @@
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);
+ if (option.data[i - 1].HIsRequired) {
+ $('#HIsRequired' + i + '').attr("checked", true);
+ }
}
form.render('select');
+ form.render('checkbox');
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -607,9 +629,12 @@
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);
+ if (option.data[i - 1].HIsRequired) {
+ $('#HIsRequired' + i + '').attr("checked", true);
+ }
}
form.render('select');
-
+ form.render('checkbox');
}
break;
@@ -663,6 +688,7 @@
, { field: 'HMax', title: '涓婇檺', edit: 'text', totalRow: true }
, { field: 'HMin', title: '涓嬮檺', edit: 'text', totalRow: true }
, { field: 'HDataForm', title: '閲囬泦鏉ユ簮', templet: '#HDataForm-select' }
+ , { field: 'HIsRequired', title: '鏄惁蹇呭綍', templet: "#HIsRequired", }
, { field: 'HDataUnit', title: '閲囬泦鏃堕棿鍗曚綅', templet: '#HDataUnit-select' }
, { field: 'HDataTimes', title: '閲囬泦鍛ㄦ湡棰戠巼', edit: 'text', totalRow: true }
, { field: 'HTechParamClassID', title: '宸ヨ壓鍙傛暟澶х被', hide: true }
@@ -962,7 +988,6 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- // table.cache["mainTable"].splice(0, 1);
table.cache["mainTable"] = table.cache["mainTable"].filter(row => row.HTechParamID !== 0 && row.HTechParamID !== undefined);
for (var rowData of checkStatus.data) {
var NewRow = {
@@ -974,7 +999,8 @@
"HStd": "0",
"HMax": "0",
"HMin": "0",
- "HDataForm": "鎵嬪伐褰曞叆",
+ "HDataForm": "璁惧閲囬泦",
+ "HIsRequired": false,
"HDataUnit": "绉�",
"HDataTimes": "0",
"HTechParamClassID": "0",
@@ -989,24 +1015,7 @@
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);
+ table.render(option);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, end: function () {
@@ -1313,8 +1322,8 @@
var tableSub = result.data[1];
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HInterID": tableMain[0]["HInterID"]
- , "HBillNo": tableMain[0]["鍗曟嵁鍙�"]
+ "HInterID": OperationType == 2 ? "" : tableMain[0]["HInterID"]
+ , "HBillNo": OperationType == 2 ? "" : tableMain[0]["鍗曟嵁鍙�"]
, "HDate": Format(new Date(tableMain[0]["鏃ユ湡"]), "yyyy-MM-dd")
, "HMaterID": tableMain[0]["HMaterID"]
, "HMaterNumber": tableMain[0]["鐗╂枡浠ｇ爜"]
@@ -1349,11 +1358,14 @@
});
//瀛愯〃 璧嬪��
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");;
+ if (option.data[i-1].HIsRequired) {
+ $('#HIsRequired' + i).attr("checked", true);
+ }
+ $('#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');
@@ -1391,7 +1403,7 @@
num.push(table.cache["mainTable"][i])
}
-
+
}
var sMainStr = JSON.stringify(data.field);
--
Gitblit v1.9.1