From 1ec9b7a00e8b82b8f5e8d767831db0d86e6b9b69 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 27 六月 2025 15:32:17 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 17 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index 4fe43a7..3675fb9 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -92,13 +92,7 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" 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="HUpLimit" id="HUpLimit" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
+ </div>
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -117,7 +111,8 @@
<input type="text" class="layui-input" id="HMouldNum" name="HMouldNum">
</div>
</div>
- <div class="layui-inline" id="sczz" style="display:none">
+ <div class="layui-inline" id="sczz">
+ <!--style="display:none"-->
<label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="hidden" class="layui-input" lay-verify="HSourceID" name="HSourceID" id="HSourceID" value="0">
@@ -127,10 +122,30 @@
</button>
</div>
</div>
+ <div class="layui-inline" id="sczz">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="hidden" class="layui-input" lay-verify="HProcID" name="HProcID" id="HProcID" value="0">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcID" id="btnHProcID" style="padding: 0 10px; margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+
<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="HTargetVal" id="HTargetVal">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px; margin-left: 50px;">涓婇檺</label>
+ <div class="layui-input-block" style="margin-left: 170px;">
+ <input type="text" class="layui-input" name="HUpLimit" id="HUpLimit" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -303,6 +318,12 @@
});
//#endregion
+ //#region 宸ュ簭
+ form.on('submit(btnHProcID)', function (data) {
+ btnHProcID();
+ });
+ //#endregion
+
//#region 妫�楠岄」鐩�
form.on('submit(btnHQCCheckItemID)', function (data) {
btnCheckProjectList(2);
@@ -357,11 +378,11 @@
});
});
- //#region 妫�绱㈡ā寮忎笅鎷夊垪琛ㄧ洃鍚�
- form.on('select(HDeptName)', function (data) {
- changeInput_Dept();
- });
- //#endregion
+ ////#region 妫�绱㈡ā寮忎笅鎷夊垪琛ㄧ洃鍚�
+ //form.on('select(HDeptName)', function (data) {
+ // changeInput_Dept();
+ //});
+ ////#endregion
//#endregion
@@ -1350,7 +1371,7 @@
var HQCCheckItemID = $("#HQCCheckItemID").val();//妫�楠岄」鐩�
var HMouldNum = $("#HMouldNum").val();//绌村彿
var HSourceID = $("#HSourceID").val();//鐢熶骇璧勬簮
-
+ var HProcID = $("#HProcID").val();//宸ュ簭
if (limit == 0) {
return layer.msg("鏍锋湰鏁伴噺涓嶈兘涓�0!");
}
@@ -1372,6 +1393,7 @@
, HQCCheckItemID: HQCCheckItemID
, HMouldNum: HMouldNum
, HSourceID: HSourceID
+ , HProcID: HProcID
}
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -1388,7 +1410,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐗╂枡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1415,7 +1437,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1431,7 +1453,32 @@
, btn2: function (index, layero) { }
})
}
-
+
+ //宸ュ簭
+ function btnHSourceID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', '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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
//妫�楠岄」鐩垪琛�
function btnHQCCheckItemID() {
--
Gitblit v1.9.1