From 52da37d4a88d9c52c74b82b553e7876694ec990c Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期三, 08 九月 2021 16:04:00 +0800
Subject: [PATCH] 恢复首检单
---
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
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 1565462..f21431f 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"
@@ -48,11 +48,11 @@
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 10px;">
<!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
- </button>-->
+ <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
+ </button>-->
<!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
- </button>-->
+ <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
+ </button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
@@ -111,6 +111,7 @@
<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="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
</div>
</div>
</div>
@@ -331,9 +332,14 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HICMOEntryID = params[params[3]];//婧愬崟瀛恑d
}
/*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
-
+ //////娴嬭瘯鐢ㄦ暟鎹�
+ //var OperationType = 2;
+ //var linterid = 11880;
+ //var HSouceBillType = 3722;
+ //var HICMOEntryID = 100027;
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
$("#HInterID").val("");
@@ -414,6 +420,7 @@
$("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
$("#HMainSourceBillType").val(data.HBillType);
$("#HMainSourceInterID").val(data.HInterID);
+ $("#HICMOEntryID").val(data.HICMOEntryID);
} else {
layer.alert(result.Message, { icon: 5 });
}
@@ -431,7 +438,7 @@
$.ajax({
url: GetWEBURL() + "/QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp",
type: "GET",
- data: { "HInterID": linterid, "HEntryID": 0, "HBillType": HSouceBillType },
+ data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
@@ -448,6 +455,7 @@
$("#HMainSourceBillNo").val("");
$("#HMainSourceBillType").val(data.HBillType);
$("#HMainSourceInterID").val(data.HInterID);
+ $("#HICMOEntryID").val(data.HICMOEntryID);
} else {
layer.alert(result.Message, { icon: 5 });
}
@@ -510,7 +518,7 @@
form.on('submit(btn-AddNew)', function (data) {
window.location.reload();
});
-
+
//閫�鍑�
function get_Exit() {
@@ -730,7 +738,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
- data: { "CheckProjectID": $("#HQCCheckProjectID").val()},
+ data: { "CheckProjectID": $("#HQCCheckProjectID").val() },
success: function (result) {
option.data = result.data;
table.render(option);
@@ -799,6 +807,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HICMOInterID").val(checkStatus.data[0].hmainid);
+ $("#HICMOEntryID").val(checkStatus.data[0].hsubid);
$("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -939,8 +948,8 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
"HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HResult": "",
--
Gitblit v1.9.1