From ee3f95ac1d13a174b7672a53dd416ede7866e294 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期六, 07 三月 2026 16:13:17 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
index b45af44..6b5b476 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
@@ -55,10 +55,13 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;" id="BT_HProName">褰撳墠宸ュ簭</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HProName">褰撳墠宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" lay-verify="HProcID" name="HProcID" id="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" 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">
@@ -389,6 +392,11 @@
btnHBadReason();
});
+ //閫夌潃宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ btnHProc();
+ });
+
//閫夋嫨璐ㄦ鍛�
form.on('submit(btnHEmp)', function () {
btnHEmp();
@@ -513,26 +521,18 @@
type: "GET",
url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ data: { "HBarCode": HBarCode, "HProcID": $("#HProcID").val(), "user": sessionStorage["HUserName"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
layer.close(index);
-
- var numHProcess = 0;
- for (var i = 0; i < data1.data.length; i++) {
- if (data1.data[i]["HProcID"] == $("#HProcID").val()) {
- numHProcess = data1.data[i]["HProcExchEntryID"];
- break;
- }
- }
$("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
$("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
$("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
$("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
$("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
- $("#HProcExchEntryID").val(numHProcess);
+ $("#HProcExchEntryID").val(data1.data[i]["HProcExchEntryID"]);
$("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]);
$("#HMaterID").val(data1.data[0]["HMaterID"]);
$("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
@@ -562,9 +562,7 @@
layer.close(indexs);
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- });
-
-
+ });
}
//涓嶈壇鍘熷洜閫夋嫨椤甸潰
@@ -593,6 +591,30 @@
})
}
+ //宸ュ簭閫夋嫨椤甸潰
+ function btnHProc() {
+ 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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
//璐ㄦ鍛橀�夋嫨椤甸潰
function btnHEmp() {
layer.open({
--
Gitblit v1.9.1