From 486cb9f344acc45ecf0ce652fab7fbcf0f2bc45a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 03 十一月 2025 16:25:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html | 374 ++++++++++++++++++++++++++++++++++--
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 186 ++++++++++++------
2 files changed, 470 insertions(+), 90 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
index 880d82d..72a1ebb 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
@@ -108,6 +108,7 @@
<select name="HMainSourceBillType" id="HMainSourceBillType">
<option value="1102" selected>閲囪喘璁㈠崟</option>
<option value="1103">鏀舵枡閫氱煡鍗�</option>
+ <option value="1201">閲囪喘鍏ュ簱鍗�</option>
</select>
</div>
</div>
@@ -130,6 +131,7 @@
value="1">
</div>
</div>
+
<div class="layui-inline zy-hidden">
<label class="layui-form-label"
style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
@@ -223,6 +225,13 @@
<div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">妫�楠孲N</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HRemarkSN" id="HRemarkSN"
+ style="display: inline-block;">
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label"
style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
@@ -724,13 +733,9 @@
<option value="=" selected="selected">=</option>
<option value=">">></option>
<option value=">=">>=</option>
- <option value="<">
- << /option>
- <option value="<=">
- <=< /option>
- <option value="<>">
- <>
- </option>
+ <option value="<"><</option>
+ <option value="<="><=</option>
+ <option value="<>"><></option>
<option value="between">between</option>
</select>
</div>
@@ -988,6 +993,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
+ async: false,
data: { "HBillType": '7503' },
success: function (d) {
//console.log(d.data);
@@ -995,8 +1001,12 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HMaker").val(sessionStorage["HUserName"]);
+
+ console.log("HInterID: " + d.data[0].HInterID)
}
});
+
+ console.log("HInterID: " + $("#HInterID").val())
if (HSouceBillType && linterid && HEntryID) {
// 鏄惁鏄笅鎺ㄧ敓鎴愬崟鎹�
if (HSouceBillType == 1102) {
@@ -1018,7 +1028,17 @@
//鑷姩甯﹀嚭妫�楠屾柟妗�
GetCheckItemID();
}
- } else {
+ }
+ else if (HSouceBillType == 1201) {
+ // 閲囪喘鍏ュ簱鍗曚笅鎺�
+ LoadingInformation_Kf_POStockInBill();
+ if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+ (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
+ }
+ }
+ else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
}
}
@@ -1342,7 +1362,6 @@
$("#HMaterID").val(data1['HMaterID'])
$("#HMaterNumber").val(data1['鐗╂枡浠ｇ爜'])
$("#HMaterName").val(data1['鐗╂枡鍚嶇О'])
- debugger
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1664,7 +1683,151 @@
}
});
}
+ if (obj.event === 'HQualityStdID') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ㄩ噺鏍囧噯鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QualityStd.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HQualityStdID: checkStatus.data[0].HItemID,
+ HQualityStdName: checkStatus.data[0].璐ㄩ噺鏍囧噯鍚嶇О,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ if (OptionData.length == 0) { return }
+ if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+ debugger
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HQualityStdID": OptionData[0].HItemID
+ , "HQualityStdName": OptionData[0].璐ㄩ噺鏍囧噯鍚嶇О
+ })
+ } else {
+ layer.msg("璇ヨ川閲忔爣鍑嗗凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+ }
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectMethodID') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟娉曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectMethodID: checkStatus.data[0].HItemID,
+ HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉曞悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ if (OptionData.length == 0) { return }
+ if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HInspectMethodID": OptionData[0].HItemID
+ , "HInspectMethodName": OptionData[0].妫�楠屾柟娉曞悕绉�
+ })
+ } else {
+ layer.msg("璇ユ楠屾柟娉曞凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+ }
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectBasisID') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼緷鎹垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectBasis.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectBasisID: checkStatus.data[0].HItemID,
+ HInspectBasisName: checkStatus.data[0].妫�楠屼緷鎹悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ if (OptionData.length == 0) { return }
+ if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HInspectBasisID": OptionData[0].HItemID
+ , "HInspectBasisName": OptionData[0].妫�楠屼緷鎹悕绉�
+ })
+ } else {
+ layer.msg("璇ユ楠屼华鍣ㄥ凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+ }
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
obj.event = "";
return false;
@@ -1985,7 +2148,6 @@
, HMainSourceInterID: data.HMainSourceInterID
, HMainSourceEntryID: data.HMainSourceEntryID
, HMainSourceBillType: data.HMainSourceBillType
-
});
data = result.data;
//data = result.data.h_v_QC_Edit_POStockInCheckBillList;
@@ -2001,14 +2163,21 @@
"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
"HInspectVal": data[i].妫�娴嬪��, "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�, "HDownOffSet": data[i].涓嬪亸宸�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�,
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": 0, "HRejectQty": data[i].鎷掔粷鏁�,
- "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": 0, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HStrictness": data[i].涓ユ牸搴�
-
+ "HCompareSymbol": data[i]["姣旇緝绗�"],
+ "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i]["璐ㄩ噺鏍囧噯"],
+ "HInspectMethodID": data[i]["HInspectMethodID"], "HInspectMethodName": data[i]["妫�楠屾柟娉�"], "HInspectBasisID": data[i]["HInspectBasisID"], "HInspectBasisName": data[i]["妫�楠屼緷鎹�"],
+ "HStatus": data[i].妫�楠岀粨鏋�,
+ "HStrictness": data[i].涓ユ牸搴�,
+ "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟,
+ "HAQL": data[i].AQL,
+ "HSamplingType": data[i].鎶芥牱绫诲瀷
}
)
SummaryIndex.push(i.toString());
}
option.data = rowdata;
+ option_Check = rowdata
table.render(option);
for (let j = 0; j < data.length; j++) {
$("#HResult" + (j + 1)).val(data[j].缁撹 == "鍚堟牸" ? 1 : 2)
@@ -2026,6 +2195,12 @@
//$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
$("tr[data-index = " + (option.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+
+ rowDoubleCallBack({
+ tr: $("tr[data-index = " + (option.data.length - 1) + "]"),
+ data: option.data[option.data.length - 1],
+ index: option.data.length
+ })
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -2035,6 +2210,7 @@
layer.close(ajaxLoad);
layer.alert("鍙戠敓閿欒!", { icon: 5 });
}, complete: function () {
+
GetCheckItemID()
}
})
@@ -2373,7 +2549,7 @@
//#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
function get_CheckItem() {
- var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+ var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
@@ -2392,7 +2568,9 @@
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
- "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
+ "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HCompareSymbol": data[i]["姣旇緝绗�"], "HTargetVal": data[i]['鐩爣鍊�'],
+ "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i]["璐ㄩ噺鏍囧噯"],
+ "HInspectMethodID": data[i]["HInspectMethodID"], "HInspectMethodName": data[i]["妫�楠屾柟娉�"], "HInspectBasisID": data[i]["HInspectBasisID"], "HInspectBasisName": data[i]["妫�楠屼緷鎹�"],
}
);
SampleNum.push(data[0].鏍锋湰閲�);
@@ -2423,22 +2601,99 @@
$("[name='HEntryID']").attr("value", result.data.length);
$("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
$("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
- //榛樿閫変腑鏈�鍚庝竴琛�
- $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
- //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
- $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
- trindex = result.data.length - 1;
- $("#HEntryID").val() - 1
+ // //榛樿閫変腑鏈�鍚庝竴琛�
+ // $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick()
+
+ // //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+ // $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+
+
//鎼哄甫鍑鸿川妫�鏂规
ReturnSampleScheme(data);
+
+ rowDoubleCallBack({
+ tr: $("tr[data-index = " + (result.data.length - 1) + "]"),
+ data: result.data[result.data.length - 1],
+ index: result.data.length - 1
+ })
}
}
})
+
+
}
+
+ // 鍙屽嚮閫変腑琛屽洖璋冨嚱鏁�
+ function rowDoubleCallBack(obj) {
+ $("#HInspectResultToSee").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+
+ //鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
+ var dataindex = $("#HEntryID").val() - 1;
+ console.log($(obj.tr)[0].offsetTop)
+ //鑾峰彇褰撳墠鐐瑰嚮琛屼笅鏍�
+ var nowindex = $(obj.tr).attr("data-index");
+ editIndex = Number(nowindex) + Number(1);
+ LastIndex = nowindex;
+ debugger
+ if (option_Check.length > 0) {
+ $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+ $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+ //鏄剧ず褰撳墠鍙屽嚮琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+ $("#HTargetVal").val(option_Check[nowindex].鐩爣鍊�);
+ $("#HUpLimit").val(option_Check[nowindex].涓婇檺鍊�);
+ $("#HDownLimit").val(option_Check[nowindex].涓嬮檺鍊�);
+ $('#HComparator').val(option_Check[nowindex].姣旇緝绗� || option_Check[nowindex]["HCompareSymbol"])
+ }
+ form.render('select')
+
+ //閫変腑琛屾敼鍙橀鑹�
+ check_row(obj);
+ //鑾峰彇褰撳墠閫変腑琛屽彿
+ var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
+ //鎶婃楠屽�兼暟鎹瓨鍒版暟缁�
+ //createArr(rowIndex);
+
+ //鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
+ var table_value = table.cache['ValueTable'];
+
+ // if (OperationType == 3) {
+ // set_SaveValue(Number(nowindex) + Number(1));
+ // } else {
+ // set_SaveValue(dataindex + 1);
+ // }
+ //璧嬪�间笌鍥炴樉
+ if ($("#HSampleSchemeID").val() != "0") {
+ Assignment(nowindex, dataindex);
+ }
+ if (isHavingCount == false && OperationType != 3) {
+ var row_value = [];
+ for (let i = 0; i < SampleNum[nowindex]; i++) {
+ row_value.push({
+ "HSEQ": (i + 1), "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
+ });
+ }
+ //鍒锋柊妫�楠屽�艰〃鏍�
+ option_Value.data = row_value;
+ table.render(option_Value);
+ }
+ if (isFristClick != true) {
+ //if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
+ //console.log('aaa');
+
+ // return;
+ //}
+ //淇濆瓨妫�楠屽��
+ } else {
+ isFristClick = false;
+ }
+ }
+
//鏍规嵁璐ㄦ鏂规鑷姩甯﹀嚭鎶芥牱鏂规淇℃伅
function ReturnSampleScheme(data) {
- $("#HSampleSchemeID").val(data[data.length - 1].hmainid);
+ $("#HSampleSchemeID").val(data[data.length - 1].HSampleSchemeID);
$("#HSampleSchemeName").val(data[data.length - 1].鎶芥牱鏂规鍚嶇О);
$("#HSamplingType").val(data[data.length - 1].鎶芥牱绫诲瀷);
$("#HInspectionLevel").val(data[data.length - 1].妫�楠屾按骞�);
@@ -2456,7 +2711,7 @@
if ($("#HEntryID").val() - 1 >= 0) {
- option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].hmainid;
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].HSampleSchemeID;
option.data[$("#HEntryID").val() - 1].HSampleSchemeName = data[data.length - 1].鎶芥牱鏂规鍚嶇О;
option.data[$("#HEntryID").val() - 1].HSamplingType = data[data.length - 1].鎶芥牱绫诲瀷;
option.data[$("#HEntryID").val() - 1].HInspectionLevel = data[data.length - 1].妫�楠屾按骞�;
@@ -2854,7 +3109,8 @@
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": "", "HQualityStdID": "0", "HQualityStdName": "",
+ "HInspectMethodID": "0", "HInspectMethodName": "", "HInspectBasisID": "0", "HInspectBasisName": "",
}];
option = {
elem: '#mainTable'
@@ -2872,13 +3128,24 @@
, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
, {
field: '妫�楠屼华鍣ㄤ唬鐮�', title: '妫�楠屼华鍣ㄤ唬鐮�', totalRow: true, templet: function (d) {
- return '<span style="color: blue;" lay-event="妫�楠屼华鍣ㄤ唬鐮�">' + d.妫�楠屼华鍣ㄤ唬鐮� + '</span>';
+ return '<span style="color: blue;" lay-event="妫�楠屼华1鍣ㄤ唬鐮�">' + d.妫�楠屼华鍣ㄤ唬鐮� + '</span>';
}, style: 'cursor: pointer;'
}
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
+
, { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
, { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
+ , { field: 'HQualityStdID', title: 'HQualityStdID', edit: 'text', hide: true },
+ , { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: "HQualityStdID" },
+
+ , { field: 'HInspectMethodID', title: 'HInspectMethodID', edit: 'text', hide: true },
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: "HInspectMethodID" },
+
+ , { field: 'HInspectBasisID', title: 'HInspectBasisID', edit: 'text', hide: true },
+ , { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: "HInspectBasisID" },
+
+
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
@@ -2901,7 +3168,7 @@
, { field: 'HSampleUnRightQty', title: '鏍锋湰涓嶅悎鏍兼暟', edit: 'text', hide: true }
, { field: 'HAQL', title: 'AQL', edit: 'text', hide: true }
, { field: 'HStatus', title: '鐘舵��', edit: 'text', hide: true }
- , { field: 'xxx', title: '姣旇緝绗�', edit: 'text', hide: true }
+ , { field: 'HCompareSymbol', title: '姣旇緝绗�', edit: 'text', hide: false }
, { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text', hide: true }
, { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text', hide: true }
@@ -3181,17 +3448,17 @@
//#region 銆愬弻鍑绘楠岄」鐩浜嬩欢銆�
table.on('rowDouble(mainTable)', function (obj) {
+
$("#HInspectResultToSee").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
//鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
var dataindex = $("#HEntryID").val() - 1;
-
+ console.log($(obj.tr)[0].offsetTop)
//鑾峰彇褰撳墠鐐瑰嚮琛屼笅鏍�
var nowindex = $(obj.tr).attr("data-index");
editIndex = Number(nowindex) + Number(1);
LastIndex = nowindex;
-
if (option_Check.length > 0) {
$("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
@@ -3200,7 +3467,9 @@
$("#HTargetVal").val(option_Check[nowindex].鐩爣鍊�);
$("#HUpLimit").val(option_Check[nowindex].涓婇檺鍊�);
$("#HDownLimit").val(option_Check[nowindex].涓嬮檺鍊�);
+ $('#HComparator').val(option_Check[nowindex].姣旇緝绗� || option_Check[nowindex]["HCompareSymbol"])
}
+ form.render('select')
//閫変腑琛屾敼鍙橀鑹�
check_row(obj);
@@ -3678,7 +3947,6 @@
//鑾峰彇鏂囨湰妗嗗��
var maindata = table.cache['mainTable'];
- debugger
//璧嬪�硷紝鍌ㄥ瓨鏁版嵁
maindata[dataindex].HStatus = dataobj.HStatus;
maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
@@ -4257,6 +4525,8 @@
//妫�楠屽�间繚瀛�
function set_SaveValue(dataindex) {
+ // 灏嗘楠屽�间腑鐨勫唴瀹逛笌瀛愯〃涓殑鍐呭鍋氬悓姝�
+
if (OperationType == 3) {
EchoValue();
}
@@ -4632,6 +4902,39 @@
})
}
+ // 閫氳繃閲囪喘鍏ュ簱鍗曡幏鍙栨簮鍗曚俊鎭�
+ function LoadingInformation_Kf_POStockInBill() {
+ var wait = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + "/QC_POStockInCheckBill/get_Kf_POStockInBill_Tmp",
+ type: "GET",
+ async: false,
+ data: {
+ HInterID: linterid,
+ HEntryID: HEntryID,
+ HBillType: 1201
+ },
+ success: function (res) {
+ if (res.count == 1) {
+ $("#HMaterID").val(res.data[0]['HMaterID'])
+ $("#HMaterName").val(res.data[0]['HMaterName'])
+ $("#HMaterNumber").val(res.data[0]['HMaterNumber'])
+ $("#HMainSourceBillNo").val(res.data[0]['HBillNo'])
+ $("#HMainSourceInterID").val(res.data[0].HInterID)
+ $("#HMainSourceEntryID").val(res.data[0].HEntryID)
+ $("#HQCSchemeName").val(res.data[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(res.data[0].妫�楠屾柟妗圛D);
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
+ }
+ },
+ complete: function () {
+ layer.close(wait)
+ }
+ })
+ }
+
// 閫氳繃鏀舵枡閫氱煡鍗曡幏鍙栨簮鍗曚俊鎭�
function LoadingInformation_POInStockBill() {
var wait = layer.load();
@@ -4912,6 +5215,21 @@
function GetInspectInstruMentValue(obj) {
OptionData = obj;
}
+
+ //璐ㄩ噺鏍囧噯
+ function GetQualityStdValue(obj) {
+ OptionData = obj;
+ }
+ //妫�楠屾柟娉�
+ function GetInspectMethodValue(obj) {
+ OptionData = obj;
+ }
+
+ //妫�楠屼緷鎹�
+ function GetInspectBasisValue(obj) {
+ OptionData = obj;
+ }
+
</script>
</body>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 76617be..257b0a2 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>閲囪喘鍏ュ簱鍗曞垪琛�</title>
@@ -26,6 +27,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -42,26 +44,30 @@
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -72,23 +78,27 @@
</select>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-row">
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
</div>
<div class="layui-inline" style="display:none;">
<label class="layui-form-label">椤圭洰缂栧彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber"
+ id="HProjectNumber" style="width:190px;">
</div>
</div>
-
+
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -98,19 +108,22 @@
<div class="layui-inline">
<label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HSupID" id="HSupID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSupID"
+ id="HSupID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID" id="HDeptID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID"
+ id="HDeptID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID" id="HMangerID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID"
+ id="HMangerID" style="width:190px;">
</div>
</div>
</div>
@@ -119,19 +132,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" class="ForFilteringSchemes" style="width:190px;">
+ <select name="ColName" id="ColName" lay-filter="ColName"
+ class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -139,26 +158,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<div class="layui-inline">
<label class="layui-form-label">杩囨护1</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -166,26 +192,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<div class="layui-inline">
<label class="layui-form-label">杩囨护2</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -193,7 +226,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -212,6 +246,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPayableBills" id="btn-PushPayableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴斾粯鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPOStockInBackBills" id="btn-PushPOStockInBackBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閲囪喘閫�鏂欏崟)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushPOStockInChangeBills" id="btn-PushPOStockInChangeBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閲囪喘璋冧环鍗�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushPoInStockCheckBill" id="btn-PushPoInStockCheckBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鏉ユ枡妫�楠屽崟)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
@@ -272,7 +307,7 @@
//#endregion
var titleData = ["hmainid", "hsupid", "hsecmanagerid", "hkeeperid", "HDeptID", "hsubid", "hmaterid", "hunitid", "hwhid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- //#region 銆愯繃婊ゆ柟妗堛��
+ //#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
@@ -298,7 +333,7 @@
set_ClearQuery();
optionPage.curr = 1;
get_FastQuery();
-
+
});
//#endregion
@@ -306,7 +341,7 @@
form.on('submit(btnSearch)', function (data) {
optionPage.curr = 1;
get_FastQuery(table, option, 2);
-
+
});
//#endregion
@@ -329,7 +364,7 @@
}
});
-
+
//#endregion 杈撳叆妗嗗洖杞︾洃鍚�
$('input[type="text"]').on('keydown', function (event) {
if (event.keyCode == 13) {
@@ -381,8 +416,8 @@
//鍒濆鍖栭〉澶у皬
// DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery(table, option,2);
-
+ get_FastQuery(table, option, 2);
+
//闅愯棌鍕鹃�夊瓧娈�
// DisPlay_HideColumn();
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
@@ -393,7 +428,7 @@
}
//#endregion
//#region 鍒濆鍖栬〃鏍兼柟娉�
-
+
function set_InitGrid() {
option = {
elem: '#mainTable'
@@ -409,7 +444,7 @@
}
, cols: [[
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160, sort: true }
, { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true }
@@ -432,10 +467,10 @@
, { field: 'hunitid', title: 'hunitid', width: 200, hide: true, sort: true }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200, sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200, sort: true }
- , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200, sort: true, totalRow: true}
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200, sort: true, totalRow: true}
- , { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true, totalRow: true}
- , { field: '閲戦', title: '閲戦', width: 200, sort: true, totalRow: true}
+ , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200, sort: true, totalRow: true }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200, sort: true, totalRow: true }
+ , { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true, totalRow: true }
+ , { field: '閲戦', title: '閲戦', width: 200, sort: true, totalRow: true }
, { field: 'hwhid', title: 'hwhid', width: 200, hide: true, sort: true }
, { field: 'HWHID', title: 'HWHID', hide: true, sort: true }
, { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', width: 150, sort: true }
@@ -456,7 +491,7 @@
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100, sort: true }
, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125, sort: true }
- , { field: '琛屽叧闂棩鏈�', title: '琛屽叧闂棩鏈�', width: 200, templet: "<div>{{d.琛屽叧闂汉 == ''?'':layui.util.toDateString(d.琛屽叧闂棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '琛屽叧闂棩鏈�', title: '琛屽叧闂棩鏈�', width: 200, templet: "<div>{{d.琛屽叧闂汉 == ''?'':layui.util.toDateString(d.琛屽叧闂棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100, sort: true }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 120, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
@@ -500,8 +535,8 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html?OperationType=3&linterid=' + linterid +'&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
-
+ , content: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
, resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
end: function () { //褰撳叧闂椂璋冪敤
get_FastQuery(table, option);
@@ -512,7 +547,7 @@
})
}
});
- //#endregion
+ //#endregion
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
@@ -525,7 +560,7 @@
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var totalArray = ["搴旀敹鏁伴噺","瀹炴敹鏁伴噺","鍏宠仈鏁伴噺","閲戦","閲囪喘閲戦","鍚◣閲戦"];
+ var totalArray = ["搴旀敹鏁伴噺", "瀹炴敹鏁伴噺", "鍏宠仈鏁伴噺", "閲戦", "閲囪喘閲戦", "鍚◣閲戦"];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
@@ -544,7 +579,8 @@
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'
, event: '鍗曟嵁鍙�', templet: function (d) {
return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;' });
+ }, style: 'cursor: pointer;'
+ });
} else {
switch (data[i].Type) {
//int
@@ -731,7 +767,7 @@
}
break;
-
+
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
break;
@@ -758,7 +794,7 @@
case 'btn-PushPOStockInChangeBills':
set_PushPOStockInChangeBills();
break;
- //瀹℃牳
+ //瀹℃牳
case 'set_CheckBill': set_CheckBill(0);
break;
//鍙嶅鏍�
@@ -825,6 +861,9 @@
//璇诲彇鏂规
case 'set_ReadScheme': set_ReadScheme();
break;
+ // 涓嬫帹 鏉ユ枡妫�楠屽崟
+ case 'btn-PushPoInStockCheckBill': set_PushPoInStockCheckBill();
+ break;
};
});
@@ -865,7 +904,7 @@
var HSupID = $("#HSupID").val();
var HDeptID = $("#HDeptID").val();
var HMangerID = $("#HMangerID").val();
-
+
//浠绘剰瀛楁杩囨护
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -1061,7 +1100,7 @@
})
//#endregion
- //鎵撳嵃
+ //鎵撳嵃
function get_PrintReport() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -1126,7 +1165,7 @@
} else {
layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
}
-
+
})
}
else {
@@ -1785,7 +1824,7 @@
$.ajax({
url: GetWEBURL() + '/Kf_POStockInBill/list',
type: "GET",
- async:false,
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -1854,6 +1893,28 @@
})
}
+ //涓嬫帹 鏉ユ枡妫�楠屽崟
+ function set_PushPoInStockCheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ debugger
+ // 涓嬫帹 鏉ユ枡妫�楠屽崟
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鏉ユ枡妫�楠屽崟" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["100%", "100%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html?OperationType=2&linterid=' + data[0].hmainid + '&HSouceBillType=' + data[0].HBillType + '&HICMOEntryID=&HEntryID=' + data[0].hsubid, "yes"]
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛屼笅鎺�!!!", { time: 1 * 1000, icon: 1 })
+ }
+ }
+
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
@@ -1866,7 +1927,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid", "hsupid", "hsecmanagerid", "hkeeperid", "HDeptID", "hsubid", "hmaterid", "hunitid","hwhid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "hsupid", "hsecmanagerid", "hkeeperid", "HDeptID", "hsubid", "hmaterid", "hunitid", "hwhid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
@@ -1943,9 +2004,9 @@
option.cols[0][i]["sort"] = false;
}
}
- ins=table.render(option);
+ ins = table.render(option);
} else {
- ins=table.render(option);
+ ins = table.render(option);
}
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
@@ -2266,14 +2327,14 @@
//#endregion
//#endregion
-
-
+
+
//浠ヤ笂鏄痩ayui妯″潡
});
- //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
var HInterID = obj[0].hmainid;
@@ -2311,11 +2372,12 @@
});
}
//#endregion
-
+
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1