From 61de6b1331fa9a1b4213598bacfdc4563f62a1ce Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 08 四月 2024 10:46:14 +0800
Subject: [PATCH] 1.用户表里增加 检验员 字段， 2.首件检验单、巡检单、工序检验单 初始化界面时，根据用户 带入 默认检验员。）
---
WebTM/views/user/login.html | 2 +
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 48 ++++++++++++++++++++++++
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 8 ++--
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 4 +-
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 4 ++
5 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index f6a0421..8d7f269 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -397,6 +397,8 @@
sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
sessionStorage["HProcName"] = result.data[0].HProcName;
sessionStorage["HProcID"] = result.data[0].HProcID;
+ sessionStorage["HCheckEmpID"] = result.data[0].HCheckEmpID;
+ sessionStorage["HCheckEmpName"] = result.data[0].HCheckEmpName;
sessionStorage["login"] = "login";
sessionStorage["OrganizationID"] = $("#Organization").val();
sessionStorage["Organization"] = $("#Organization option:selected").text();
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index 4479ee6..c224543 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -206,6 +206,18 @@
</div>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">妫�楠屽憳</label>
+ <div class="layui-input-inline">
+ <div class="layui-input-inline">
+ <input type="text" name="HCheckEmpName" id="HCheckEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HCheckEmpID" id="HCheckEmpID" value="0" hidden>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHCheckEmp" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -437,6 +449,11 @@
//琛ㄥご淇℃伅 鐢熶骇璧勬簮
form.on('submit(btnHSource)', function () {
btnHSource();
+ });
+
+ //琛ㄥご淇℃伅 妫�楠屽憳
+ form.on('submit(btnHCheckEmp)', function () {
+ btnHCheckEmp();
});
@@ -852,6 +869,35 @@
}
});
}
+
+ //妫�楠屽憳鍒楄〃
+ function btnHCheckEmp() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屽憳鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ $("#HCheckEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HCheckEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ });
+ }
//缂栬緫鑾峰彇琛ㄥご淇℃伅
function set_EditFromGrid(linterid)
@@ -898,6 +944,8 @@
, "HGroupName": data.鐝粍
, "HSourceID": data.HSourceID
, "HSourceName": data.鐢熶骇璧勬簮
+ , "HCheckEmpID": data.HCheckEmpID
+ , "HCheckEmpName": data.妫�楠屽憳
});
} else {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index 53360d2..bb1db9e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -392,6 +392,10 @@
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
+
+ $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HEmpName").val(sessionStorage["HCheckEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
option.data = [{ "妫�楠岄」鐩垎绫�":"","HQCCheckItemID":0,"HQCCheckItemName": "", "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " " }];
table.render(option);
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 94d3efc..a381201 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -738,8 +738,8 @@
$("#HBillNo").val("");
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
- $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
- $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+ $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HCheckEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -755,8 +755,8 @@
});
}
else if (OperationType == 2) {
- $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
- $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);
+ $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]);
+ $("#HFirstCheckEmpName").val(sessionStorage["HCheckEmpName"]);
if (HICMOEntryID < 0 || HICMOEntryID == "") {
layer.alert("鐢熶骇浠诲姟鍗曞瓙鍐呯爜閿欒锛屾棤娉曞伐搴忔锛�", { icon: 5 });
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 5fd86d8..4be6002 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -727,8 +727,8 @@
$("#HInterID").val("");
$("#HBillNo").val("");
- $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
- $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+ $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HCheckEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
//$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
//鑾峰彇鏈�澶у崟鎹彿
--
Gitblit v1.9.1