From 94853e46b9d4911fb4cf00389f00a4b820db5d3c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 14:35:46 +0800
Subject: [PATCH] fix: 修正 系统上机日志查询 没有显示默认方案的问题
---
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 201 insertions(+), 34 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 f4348f5..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">
@@ -205,7 +205,7 @@
<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;">
</div>
- </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -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
//澶村伐鍏锋爮浜嬩欢
@@ -559,17 +576,22 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HTechParamID": "",
+ "HTechParamID": 0,
"HTechParamNumber": "",
"HTechParamName": "",
- "HTechParamUnitID": "",
+ "HTechParamUnitID": 0,
"HTechParamUnitName": "",
"HStd": "0",
"HMax": "0",
"HMin": "0",
"HDataForm": "璁惧閲囬泦",
"HDataUnit": "绉�",
+ "HIsRequired": false,
"HDataTimes": "0",
+ "HTechParamClassID": "0",
+ "HSNO": "0",
+ "HStdNextTimes": "0",
+ "HTechParamIDStd": "0",
"HSourceBillNo": "0",
"HSourceBillType": "0",
"HSourceEntryID": "0",
@@ -583,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);
@@ -603,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;
@@ -659,12 +688,42 @@
, { 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 }
+ , { field: 'HTechParamClassName', title: '宸ヨ壓鍙傛暟澶х被鍚嶇О', edit: 'text', event: "HTechParamClassName" } //f7
+ , { field: 'HSNO', title: '宸ヨ壓娆″簭', edit: 'text', totalRow: true }
+ , { field: 'HStdNextTimes', title: '鐞嗚娆″簭闂撮殧', edit: 'text', totalRow: true }
+ , { field: 'HTechParamIDStd', title: '瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�', hide: true }
+ , { field: 'HTechParamIDStdName', title: '瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁板��', edit: 'text', event: "HTechParamIDStdName " } //f7
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
}
- option.data = [];
+ var rowdata = [
+ {
+ "HTechParamID": 0,
+ "HTechParamNumber": "",
+ "HTechParamName": "",
+ "HTechParamUnitID": 0,
+ "HTechParamUnitName": "",
+ "HStd": "0",
+ "HMax": "0",
+ "HMin": "0",
+ "HDataForm": "璁惧閲囬泦",
+ "HDataUnit": "绉�",
+ "HDataTimes": "0",
+ "HTechParamClassID": "0",
+ "HSNO": "0",
+ "HStdNextTimes": "0",
+ "HTechParamIDStd": "0",
+ "HSourceBillNo": "0",
+ "HSourceBillType": "0",
+ "HSourceEntryID": "0",
+ "HSourceInterID": "0"
+ }
+ ];
+ option.data = rowdata;
table.render(option);
}
@@ -911,11 +970,10 @@
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%'],
@@ -929,12 +987,35 @@
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"] = table.cache["mainTable"].filter(row => row.HTechParamID !== 0 && row.HTechParamID !== undefined);
+ 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": "璁惧閲囬泦",
+ "HIsRequired": false,
+ "HDataUnit": "绉�",
+ "HDataTimes": "0",
+ "HTechParamClassID": "0",
+ "HSNO": "0",
+ "HStdNextTimes": "0",
+ "HTechParamIDStd": "0",
+ "HSourceBillNo": "0",
+ "HSourceBillType": "0",
+ "HSourceEntryID": "0",
+ "HSourceInterID": "0"
+ };
+ table.cache["mainTable"].push(NewRow);
+ }
+ option.data = table.cache["mainTable"];
+ table.render(option);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, end: function () {
@@ -988,6 +1069,85 @@
});
OptionData = [];
}
+ }
+ });
+ }
+ //宸ヨ壓鍙傛暟澶х被
+ if (obj.event == "HTechParamClassName") {
+ //鎵撳紑宸ヨ壓鍙傛暟澶х被灏忕獥浣�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ヨ壓鍙傛暟澶х被',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterType.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HTechParamClassID": checkStatus.data[0].HItemID,
+ "HTechParamClassName": checkStatus.data[0].宸ヨ壓鍙傛暟鍒嗙被鍚嶇О,
+
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , end: function () {
+ //if (OptionData.length > 0) {
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // obj.update({
+ // "HTechParamClassID": OptionData[0].HItemID,
+ // "HTechParamClassName": OptionData[0].宸ヨ壓鍙傛暟澶х被鍚嶇О,
+ // });
+ // OptionData = [];
+ //}
+ }
+ });
+ }
+ //瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�
+ if (obj.event == "HTechParamIDStdName") {
+ //鎵撳紑瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�(灏忕獥浣�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁板垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameter.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HTechParamIDStd": checkStatus.data[0].HItemID,
+ "HTechParamIDStdName": checkStatus.data[0].瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁板悕绉�,
+
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , end: function () {
+ //if (OptionData.length > 0) {
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // obj.update({
+ // "HTechParamIDStd": OptionData[0].HItemID,
+ // "HTechParamIDStdName": OptionData[0].瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁板悕绉�,
+
+ // });
+ // OptionData = [];
+ //}
}
});
}
@@ -1162,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]["鐗╂枡浠ｇ爜"]
@@ -1198,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');
@@ -1236,8 +1399,12 @@
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ table.cache["mainTable"][i].HTechParamIDStd == null ? 0 : table.cache["mainTable"][i].HTechParamIDStd
num.push(table.cache["mainTable"][i])
}
+
+
+
}
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
--
Gitblit v1.9.1