From 02af6ea33f505e4e06dc91785154898a801b267d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 14 四月 2025 12:21:56 +0800
Subject: [PATCH] 修复出站单 第三个自定义过滤没有数据显示，完善生产质量汇报单 复制一行不显示，修复不良原因查询在其他页面打开报错，性能散点报表 增加生产资源过滤，设备工艺参数点检表 完善 初始化点检人 id未赋值
---
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillSumSave.html | 86 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 4 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
index 661682a..cbf8154 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
@@ -221,6 +221,16 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
+ <!--涓嶈壇鍘熷洜鍗曞厓鏍兼寜閽�-->
+ <script type="text/html" id="HBadReasonbtn">
+ <input type="text" class="layui-input" name="HBadReason" id="HBadReason{{d.LAY_TABLE_INDEX+1}}" style="float:left;width:105px;height:175%;margin: -5px -5px -30px -15px !important"><!--涓婂彸涓嬪乏-->
+ <a class="layui-btn layui-btn-xs layui-btn-normal" layui-icon-search lay-event="HBadReasonbtn" style="float:right;width:35px;height:38px; background-color:transparent;border-style:none;color:black;font-size:20px;">...</a>
+ </script>
+ <!--涓嶈壇鐜拌薄鍗曞厓鏍兼寜閽�-->
+ <script type="text/html" id="HBadPhenomenabtn">
+ <input type="text" class="layui-input" name="HBadPhenomena" id="HBadPhenomena{{d.LAY_TABLE_INDEX+1}}" style="float:left;width:105px;height:175%;margin: -5px -5px -30px -15px !important"><!--涓婂彸涓嬪乏-->
+ <a class="layui-btn layui-btn-xs layui-btn-normal" layui-icon-search lay-event="HBadPhenomenabtn" style="float:right;width:35px;height:38px; background-color:transparent;border-style:none;color:black;font-size:20px;">...</a>
+ </script>
<script>
var HMaterID = ""; // 鐗╂枡ID
var HMaterNumber = ""; // 鐗╂枡浠ｇ爜
@@ -422,7 +432,10 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
-
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HBadReason' + i + '').val(option.data[i - 1].HBadReasonNumber);
+ $('#HBadPhenomenabtn' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ }
form.render('select');
break;
case 'btn-CopyLine':
@@ -439,7 +452,10 @@
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++) {
+ $('#HBadReason' + i + '').val(option.data[i - 1].HBadReasonNumber);
+ $('#HBadPhenomenabtn' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ }
form.render('select');
}
break;
@@ -459,6 +475,68 @@
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ //涓嶈壇鍘熷洜
+ if (obj.event == 'HBadReasonbtn') {
+ var HProcName = obj.data.HProcName;
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "涓嶈壇鍘熷洜鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html?Type=BadReason&HProcName=' + HProcName + '&openType=2', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HBadReasonID": checkStatus.data[0].HItemID
+ , "HBadReasonNumber": checkStatus.data[0].涓嶈壇缂洪櫡浠ｇ爜
+ , "HBadReasonHName": checkStatus.data[0].涓嶈壇缂洪櫡鍚嶇О
+ })
+ $("#HBadReason" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].涓嶈壇缂洪櫡鍚嶇О)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //涓嶈壇鐜拌薄
+ if (obj.event == 'HBadPhenomenabtn') {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "涓嶈壇鐜拌薄" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_BadPhenomena.html?openType=2', "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ obj.update({
+ "HBadPhenomenaID": checkStatus.data[0].HItemID
+ , "HBadPhenomenaName": checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О
+ })
+ $("#HBadPhenomenaName" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
});
//#endregion
@@ -546,9 +624,9 @@
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', style: 'background-color: #f9f9f9;' }
, { field: 'HBadReasonID', title: '涓嶈壇鍘熷洜id', hide: true }
, { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠ｇ爜', edit: 'text' , event: "HBadReasonNumber"}
- , { field: 'HBadReasonHName', title: '涓嶈壇鍘熷洜', style: 'background-color: #f9f9f9;' }
+ , { field: 'HBadReasonHName', title: '涓嶈壇鍘熷洜', style: 'background-color: #f9f9f9;', templet: '#HBadReasonbtn' }
, { field: 'HBadPhenomenaID', title: '涓嶈壇鐜拌薄id', hide: true }
- , { field: 'HBadPhenomenaName', title: '涓嶈壇鐜拌薄', edit: 'text', event: "HBadPhenomenaName" }
+ , { field: 'HBadPhenomenaName', title: '涓嶈壇鐜拌薄', edit: 'text', event: "HBadPhenomenaName", templet: '#HBadPhenomenabtn'}
, { field: 'HEmpID', title: '妫�楠屽憳id', hide: true }
, { field: 'HCheckMan', title: '妫�楠屽憳', event: "HCheckMan" }
, { field: 'HGroupID', title: '鐝粍id', hide: true }
--
Gitblit v1.9.1