From 65a72959883d1c5e77a2061730978ef83c5e32e5 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期四, 27 十一月 2025 13:33:17 +0800
Subject: [PATCH] 根据小卫问题文档的修改：具体条目：34，40，41，42，43，45，46，以及制造周期报表日期调整
---
WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html | 73 +++--
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport_TK.html | 9
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html | 12
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 12
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 13
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill_XW.html | 292 +++++++++++++++++++-
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 294 ++++++++++++++------
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 6
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindList.html | 7
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 69 ++++
WebTM/views/生产管理/制造周期报表/Sc_ProductionCycleBillList.html | 2
11 files changed, 632 insertions(+), 157 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
index aa21149..e83f1b4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
@@ -1247,7 +1247,7 @@
$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
form.render('select');
- $("#HInitTimeCycle").val("29");
+ $("#HInitTimeCycle").val("3");
}
//#endregion
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
index 4b909c4..be849f8 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
@@ -87,7 +87,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">婧愬崟绫诲瀷</label>
+ <label class="layui-form-label" style="width: 85px;">婧愬崟绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<select name="HMainSourceBillType" id="HMainSourceBillType">
<option value="1401" selected>閿�鍞鍗�</option>
@@ -96,7 +96,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">婧愬崟鍗曞彿</label>
+ <label class="layui-form-label" style="width: 85px;">婧愬崟鍗曞彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMainSourceBillNo"
id="HMainSourceBillNo"
@@ -209,7 +209,7 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterNumber"
id="HMaterNumber" value=""
@@ -235,7 +235,7 @@
</div>
<div class="layui-inline">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ style="width: 85px;padding: 9px 18px;">妫�楠屽憳<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HFirstCheckEmpName"
id="HFirstCheckEmpName"
@@ -253,7 +253,7 @@
</div>
<div class="layui-inline">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
+ style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HQCSchemeName"
id="HQCSchemeName"
@@ -285,7 +285,7 @@
</div>
<div class="layui-inline" id="hidediv1" style="margin-left:20px;">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ style="width: 85px;padding: 9px 18px;">宸ュ簭<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HProcName" id="HProcName"
style="background-color:#efefef4d;width: 60%;display: inline-block;"
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 e0dd644..dd37b82 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"
@@ -55,7 +55,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" value="0">
@@ -79,7 +79,7 @@
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭浠ｇ爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HMainProcNumber" name="HMainProcNumber" id="HMainProcNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input id="HMainProcID" name="HMainProcID" type="hidden" value="0">
@@ -95,7 +95,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">
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_XW.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_XW.html"
index a113dc4..8506aba 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_XW.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_XW.html"
@@ -38,6 +38,10 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<h1 style="text-align: center; padding: 10px 0;"><b>宸℃鍗�</b></h1>
<div class="layui-tab-content">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">sn鐮佷俊鎭�</li>
+ </ul>
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-row">
@@ -189,6 +193,7 @@
</div>
</div>
</div>
+
</div>
<div class="layui-form-item">
<div class="layui-row" style="display:none">
@@ -219,6 +224,75 @@
</div>
</div>
</div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote1_SN" id="HQCNote1_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN2</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote2_SN" id="HQCNote2_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN3</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote3_SN" id="HQCNote3_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN4</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote4_SN" id="HQCNote4_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN5</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote5_SN" id="HQCNote5_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN6</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote6_SN" id="HQCNote6_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN7</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote7_SN" id="HQCNote7_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN8</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote8_SN" id="HQCNote8_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN9</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote9_SN" id="HQCNote9_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">鎶芥SN10</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQCNote10_SN" id="HQCNote10_SN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+ </div>
</div>
</div>
</div>
@@ -244,12 +318,14 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
<script type="text/html" id="toolbarDemo2">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine_Bad"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine_Bad"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
</div>
</script>
<script type="text/html" id="xuhao">
@@ -324,6 +400,7 @@
}
var params = getUrlVars();
+
if (typeof (params[params[0]]) == "undefined") {
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
@@ -358,6 +435,7 @@
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "7506";
+ var HModName = "MES_QC_PatrolProcCheckDetail_Json";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
@@ -374,30 +452,40 @@
, cols: [[ //琛ㄥご
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+ , { field: 'HQCNote1_SN', title: '鎶芥SN1', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote2_SN', title: '鎶芥SN2', width: 185, edit: 'text', hide: true}
+ , { field: 'HQCNote3_SN', title: '鎶芥SN3', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote4_SN', title: '鎶芥SN4', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote5_SN', title: '鎶芥SN5', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote6_SN', title: '鎶芥SN6', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote7_SN', title: '鎶芥SN7', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote8_SN', title: '鎶芥SN8', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote9_SN', title: '鎶芥SN9', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote10_SN', title: '鎶芥SN10', width: 185, edit: 'text', hide: true }
, { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', event: "", width: 120 }
, { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
, { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 230 }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 95, hide: true }
, { field: 'HQCNote1', title: '妫�楠岃褰�1(09:00--11:00)', width: 185, templet: '#HQCNote1' }
- , { field: 'HQCNote1_SN', title: '鎶芥SN1', width: 185, edit: 'text' }
+
, { field: 'HQCNote2', title: '妫�楠岃褰�2(11:00--13:00)', width: 185, templet: '#HQCNote2' }
- , { field: 'HQCNote2_SN', title: '鎶芥SN2', width: 185, edit: 'text' }
+
, { field: 'HQCNote3', title: '妫�楠岃褰�3(13:00--15:00)', width: 185, templet: '#HQCNote3' }
- , { field: 'HQCNote3_SN', title: '鎶芥SN3', width: 185, edit: 'text' }
+
, { field: 'HQCNote4', title: '妫�楠岃褰�4(15:00--17:00)', width: 185, templet: '#HQCNote4' }
- , { field: 'HQCNote4_SN', title: '鎶芥SN4', width: 185, edit: 'text' }
+
, { field: 'HQCNote5', title: '妫�楠岃褰�5(17:00--19:00)', width: 185, templet: '#HQCNote5' }
- , { field: 'HQCNote5_SN', title: '鎶芥SN5', width: 185, edit: 'text' }
+
, { field: 'HQCNote6', title: '妫�楠岃褰�6(18:00--20:00)', edit: 'text', width: 185, hide: true }
- , { field: 'HQCNote6_SN', title: '鎶芥SN6', width: 185, edit: 'text', hide: true }
+
, { field: 'HQCNote7', title: '妫�楠岃褰�7', edit: 'text', hide: true }
- , { field: 'HQCNote7_SN', title: '鎶芥SN7', width: 185, edit: 'text', hide: true }
+
, { field: 'HQCNote8', title: '妫�楠岃褰�8', edit: 'text', hide: true }
- , { field: 'HQCNote8_SN', title: '鎶芥SN8', width: 185, edit: 'text', hide: true }
+
, { field: 'HQCNote9', title: '妫�楠岃褰�9', edit: 'text', hide: true }
- , { field: 'HQCNote9_SN', title: '鎶芥SN9', width: 185, edit: 'text', hide: true }
+
, { field: 'HQCNote10', title: '妫�楠岃褰�10', edit: 'text', hide: true }
- , { field: 'HQCNote10_SN', title: '鎶芥SN10', width: 185, edit: 'text', hide: true }
+
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 75 }
]]
@@ -496,11 +584,21 @@
"HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
"HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
"HQCNote8": data[i].HQCNote8, "HQCNote9": data[i].HQCNote9, "HQCNote10": data[i].HQCNote10, "HRemark": data[i].琛ㄤ綋澶囨敞,
- "HQCNote1_SN": data[i].鎶芥SN鐮�1, "HQCNote2_SN": data[i].鎶芥SN鐮�2, "HQCNote3_SN": data[i].鎶芥SN鐮�3, "HQCNote4_SN": data[i].鎶芥SN鐮�4, "HQCNote5_SN": data[i].鎶芥SN鐮�5, "HQCNote6_SN": data[i].鎶芥SN鐮�6, "HQCNote7_SN": data[i].鎶芥SN鐮�7
- , "HQCNote8_SN": data[i].鎶芥SN鐮�8, "HQCNote9_SN": data[i].鎶芥SN鐮�9, "HQCNote10_SN": data[i].鎶芥SN鐮�10
+ /* "HQCNote1_SN": data[i].鎶芥SN鐮�1, "HQCNote2_SN": data[i].鎶芥SN鐮�2, "HQCNote3_SN": data[i].鎶芥SN鐮�3, "HQCNote4_SN": data[i].鎶芥SN鐮�4, "HQCNote5_SN": data[i].鎶芥SN鐮�5, "HQCNote6_SN": data[i].鎶芥SN鐮�6, "HQCNote7_SN": data[i].鎶芥SN鐮�7*/
+ /*, "HQCNote8_SN": data[i].鎶芥SN鐮�8, "HQCNote9_SN": data[i].鎶芥SN鐮�9, "HQCNote10_SN": data[i].鎶芥SN鐮�10*/
});
}
-
+
+ $("#HQCNote1_SN").val(data[0].鎶芥SN鐮�1 || '');
+ $("#HQCNote2_SN").val(data[0].鎶芥SN鐮�2 || '');
+ $("#HQCNote3_SN").val(data[0].鎶芥SN鐮�3 || '');
+ $("#HQCNote4_SN").val(data[0].鎶芥SN鐮�4 || '');
+ $("#HQCNote5_SN").val(data[0].鎶芥SN鐮�5 || '');
+ $("#HQCNote6_SN").val(data[0].鎶芥SN鐮�6 || '');
+ $("#HQCNote7_SN").val(data[0].鎶芥SN鐮�7 || '');
+ $("#HQCNote8_SN").val(data[0].鎶芥SN鐮�8 || '');
+ $("#HQCNote9_SN").val(data[0].鎶芥SN鐮�9 || '');
+ $("#HQCNote10_SN").val(data[0].鎶芥SN鐮�10 || '');
option.data = rowdata;
table.render(option);
for (var i = 0; i < result.data.length; i++) {
@@ -542,7 +640,12 @@
});
}
-
+ // 鍦ㄩ〉闈㈠姞杞藉畬鎴愬悗锛屽鏋滃凡鏈夊瓙琛ㄦ暟鎹紝鍚屾鍒拌〃澶�
+ $(document).ready(function () {
+ setTimeout(function () {
+ syncSubTableToHeader();
+ }, 500);
+ });
//澶村伐鍏锋爮浜嬩欢
var rowid = 0;
var rows = 0;
@@ -551,8 +654,9 @@
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
var NewRow = {
- "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " ", "HQCNote1_SN": "", "HQCNote2_SN": "", "HQCNote3_SN": "", "HQCNote4_SN": "", "HQCNote5_SN": "", "HQCNote6_SN": "", "HQCNote7_SN": ""
- , "HQCNote8_SN": "", "HQCNote9_SN": "", "HQCNote10_SN": ""};
+ "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
+ , "HQCNote1_SN": $("#HQCNote1_SN").val() || '', "HQCNote2_SN": $("#HQCNote2_SN").val() || '', "HQCNote3_SN": $("#HQCNote3_SN").val() || '', "HQCNote4_SN": $("#HQCNote4_SN").val() || '', "HQCNote5_SN": $("#HQCNote5_SN").val() || '', "HQCNote6_SN": $("#HQCNote6_SN").val() || '', "HQCNote7_SN": $("#HQCNote7_SN").val() || '', "HQCNote8_SN": $("#HQCNote8_SN").val() || '', "HQCNote9_SN": $("#HQCNote9_SN").val() || '', "HQCNote10_SN": $("#HQCNote10_SN").val() || ''
+ };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -578,6 +682,10 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
//layer.alert(copyrow);
}
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
break;
}
});
@@ -1647,9 +1755,43 @@
}
});
})
+ // 鍚屾琛ㄥごSN鐮佸埌瀛愯〃
+ function syncHeaderToSubTable() {
+ var tableData = table.cache['mainTable'];
+ if (tableData && tableData.length > 0) {
+ for (var i = 0; i < tableData.length; i++) {
+ tableData[i].HQCNote1_SN = $("#HQCNote1_SN").val() || '';
+ tableData[i].HQCNote2_SN = $("#HQCNote2_SN").val() || '';
+ tableData[i].HQCNote3_SN = $("#HQCNote3_SN").val() || '';
+ tableData[i].HQCNote4_SN = $("#HQCNote4_SN").val() || '';
+ tableData[i].HQCNote5_SN = $("#HQCNote5_SN").val() || '';
+ }
+ table.reload('mainTable', {
+ data: tableData
+ });
+ }
+ }
+ // 鍚屾瀛愯〃SN鐮佸埌琛ㄥご
+ function syncSubTableToHeader() {
+ var tableData = table.cache['mainTable'];
+ if (tableData && tableData.length > 0) {
+ var firstRow = tableData[0];
+ $("#HQCNote1_SN").val(firstRow.HQCNote1_SN || '');
+ $("#HQCNote2_SN").val(firstRow.HQCNote2_SN || '');
+ $("#HQCNote3_SN").val(firstRow.HQCNote3_SN || '');
+ $("#HQCNote4_SN").val(firstRow.HQCNote4_SN || '');
+ $("#HQCNote5_SN").val(firstRow.HQCNote5_SN || '');
+ $("#HQCNote6_SN").val(firstRow.HQCNote5_SN || '');
+ $("#HQCNote7_SN").val(firstRow.HQCNote5_SN || '');
+ $("#HQCNote8_SN").val(firstRow.HQCNote5_SN || '');
+ $("#HQCNote9_SN").val(firstRow.HQCNote5_SN || '');
+ $("#HQCNote10_SN").val(firstRow.HQCNote5_SN || '');
+ }
+ }
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
+ syncHeaderToSubTable();
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sBadStr = JSON.stringify(table.cache['BadReTable']);
@@ -1684,7 +1826,125 @@
layer.alert(sMsg, { icon: 5 });
}
+ //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol.length <= i) {
+ break;
+ }
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] += "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
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 f0fbfc9..a06ff56 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"
@@ -78,7 +78,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HSourceID" id="HSourceID" value="0">
@@ -100,7 +100,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
@@ -136,7 +136,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
@@ -152,7 +152,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
@@ -163,7 +163,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -188,7 +188,7 @@
</div>
</div>
<div class="layui-inline" id="hidediv1">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HProcID" id="HProcID" value="0">
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 6eb1dc1..f07089f 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"
@@ -103,7 +103,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">婧愬崟绫诲瀷</label>
+ <label class="layui-form-label" style="width: 85px;">婧愬崟绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<select name="HMainSourceBillType" id="HMainSourceBillType">
<option value="1102" selected>閲囪喘璁㈠崟</option>
@@ -113,7 +113,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">婧愬崟鍗曞彿</label>
+ <label class="layui-form-label" style="width: 85px;">婧愬崟鍗曞彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMainSourceBillNo"
id="HMainSourceBillNo"
@@ -229,24 +229,24 @@
<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;">
+ style="display: inline-block;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterNumber"
- id="HMaterNumber" value=""
- style="background-color:#efefef4d;width: 60%;display: inline-block;"
- readonly>
+ id="HMaterNumber" value=""
+ style="background-color:#efefef4d;width: 60%;display: inline-block;"
+ readonly>
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID"
- value="0"
- style="background-color:#efefef4d;width: 60%;display: none;"
- readonly>
+ value="0"
+ style="background-color:#efefef4d;width: 60%;display: none;"
+ readonly>
<button class="layui-btn layuiadmin-btn-order" type="button"
- lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater"
+ style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -255,42 +255,49 @@
<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="HMaterName" id="HMaterName"
- style="background-color:#efefef4d;display: inline-block;" readonly>
+ style="background-color:#efefef4d;display: inline-block;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ style="width: 85px;padding: 9px 18px;">妫�楠屽憳<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HFirstCheckEmpName"
- id="HFirstCheckEmpName"
- style="background-color:#efefef4d;width: 60%;display: inline-block;"
- readonly>
+ id="HFirstCheckEmpName"
+ style="background-color:#efefef4d;width: 60%;display: inline-block;"
+ readonly>
<input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp"
- value="0">
+ value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
- lay-submit="" lay-filter="btnSearchHFirstCheckEmp"
- id="btnSearchHFirstCheckEmp"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ lay-submit="" lay-filter="btnSearchHFirstCheckEmp"
+ id="btnSearchHFirstCheckEmp"
+ 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">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
+ style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HQCSchemeName"
- id="HQCSchemeName"
- style="background-color:#efefef4d;width: 60%;display: inline-block;"
- readonly>
+ id="HQCSchemeName"
+ style="background-color:#efefef4d;width: 60%;display: inline-block;"
+ readonly>
<input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
- lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme"
+ 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">
+ <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="HQty" id="HQty"
+ style="background-color:#efefef4d;" readonly value="0">
</div>
</div>
</div>
@@ -311,7 +318,7 @@
</div>
<div class="layui-inline" id="hidediv1" style="margin-left:20px;">
<label class="layui-form-label"
- style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ style="width: 85px;padding: 9px 18px;">宸ュ簭<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HProcName" id="HProcName"
style="background-color:#efefef4d;width: 60%;display: inline-block;"
@@ -2475,6 +2482,7 @@
},
success: function (layero, index) {
+ btnSearchCheckSampleScheme
}
});
@@ -2482,6 +2490,8 @@
//琛ㄤ綋淇℃伅鎶芥牱鏂规寮圭獥
form.on('submit(btnSearchCheckSampleScheme)', function () {
+ var nowindex = $("#HEntryID").val()-1;
+ var inspectMethod = table.cache["mainTable"][nowindex].HAnalysisMethod;
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -2491,7 +2501,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.html', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.html?', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -2558,7 +2568,8 @@
//#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
function get_CheckItem() {
- var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+ var HBatchQty = $("#HQty").val() == 0 ? $("#HICMOQty").val() : $("#HQty").val();
+ //var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
@@ -2582,6 +2593,7 @@
"HInspectMethodID": data[i]["HInspectMethodID"], "HInspectMethodName": data[i]["妫�楠屾柟娉�"], "HInspectBasisID": data[i]["HInspectBasisID"], "HInspectBasisName": data[i]["妫�楠屼緷鎹�"],
}
);
+
SampleNum.push(data[0].鏍锋湰閲�);
}
@@ -4934,6 +4946,7 @@
$("#HMainSourceEntryID").val(res.data[0].HEntryID)
$("#HQCSchemeName").val(res.data[0].妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(res.data[0].妫�楠屾柟妗圛D);
+ $("#HQty").val(res.data[0].瀹炴敹鏁伴噺);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index acd95d8..2e6aa7e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -274,6 +274,8 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -457,6 +459,14 @@
break;
//鍒楄缃�
case 'set_HideColumn':get_HideColumn();
+ break;
+ //涓婁竴琛�
+ case 'btn_up':
+ btn_up();
+ break;
+ //涓嬩竴琛�
+ case 'btn_under':
+ btn_under();
break;
}
});
@@ -1599,7 +1609,66 @@
form.render('checkbox');
}
}
+ //#region 瀛愯〃1 涓婄Щ
+ function btn_up() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 1) {
+ var tables = [];
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ //濡傛灉鏄涓�琛屼笂绉伙紝鍒欏け璐ュ苟鎻愰啋
+ if (i == 0) {
+ layer.msg("绗竴琛屾暟鎹棤娉曚笂绉伙紒");
+ return;
+ }
+ tables.push(option.data[i - 1]);
+ data[0].LAY_CHECKED = true;
+ option.data[i - 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ CheckedSet_tableSub();
+ break;
+ }
+ }
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ }
+ }
+ //#endregion
+ //#region 瀛愯〃1 涓嬬Щ
+ function btn_under() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 1) {
+ var tables = [];
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ //濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
+ if (i == option.data.length - 1) {
+ layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
+ return;
+ }
+
+ tables.push(option.data[i + 1]);
+ data[0].LAY_CHECKED = true;
+ option.data[i + 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ CheckedSet_tableSub();
+ break;
+ }
+ }
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ }
+ }
+ //#endregion
//琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
function set_GridDelete(obj) {
var data = obj.data;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index 0edbb7d..79f5fd5 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -59,6 +59,13 @@
</select>
</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="HMatrerNumber" id="HMatrerNumber" style="width:190px;">
+ <input type="hidden" class="layui-input ForFilteringSchemes" name="HMatrerID" id="HMatrerID" style="width:190px;">
+ </div>
+ </div>
<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>
@@ -565,6 +572,8 @@
var HProject = $("#HProject").val();//椤圭洰鍙�
var HQCCheckProjectName = $("#HQCCheckProjectName").val();
var HOrgID = $("#HOrgID").val(); //缁勭粐
+ var HMatrerNumber = $("#HMatrerNumber").val(); //鐗╂枡
+ var HMatrerID = $("#HMatrerID").val(); //鐗╂枡
//浠绘剰瀛楁杩囨护
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -661,6 +670,9 @@
sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
sWhere += " and 宸ュ簭鍚嶇О = '" + HProcName + "'";
}
+ if (HMatrerNumber != "") {
+ sWhere += " and 鐗╂枡浠ｇ爜 ='" + HMatrerNumber + "'";
+ }
addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -671,6 +683,7 @@
function set_ClearQuery() {
$("#HBillNo").val("");
$("#HProject").val("");
+ $("#HMatrerNumber").val("");
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
$("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
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 b4ff437..61b1424 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"
@@ -59,7 +59,7 @@
<!-- 鏍囬锛屼娇鐢ㄧ粷瀵瑰畾浣嶄娇鍏跺湪鐖跺鍣ㄥ唴灞呬腑 -->
<h1 style="position: absolute; left: 50%; transform: translateX(-50%); z-index: 0; text-align: center; width: fit-content; margin: 0; padding: 0 10px;"><b>棣栦欢妫�楠屽崟</b></h1>
</div>
- <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
@@ -83,7 +83,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -105,7 +105,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
@@ -122,7 +122,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
@@ -138,7 +138,7 @@
</div>
</div>
<div class="layui-inline" id="hidediv2">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗″彿</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗″彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
@@ -174,7 +174,8 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳<label style="color:red"> * </label></label>
+
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
@@ -184,7 +185,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
@@ -194,7 +195,7 @@
</div>
</div>
- </div>
+ </div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鎵瑰彿</label>
@@ -708,7 +709,7 @@
var rowdata = [];
var option = [];
var HDeptID = "";//閮ㄩ棬id 鑾峰彇鐝
- var HCenterID = "";//宸ヤ綔涓績id 鑾峰彇鐝
+ var HCenterID = "";//宸ヤ綔涓績id 鑾峰彇鐝
var rowdata_Value = [];
var option_Value = [];
@@ -815,12 +816,11 @@
//瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
- (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
- {
+ (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
//鑷姩甯﹀嚭妫�楠屾柟妗�
GetCheckItemID();
}
-
+
}
//宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3790) {
@@ -1102,7 +1102,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩唬鐮�": "","妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩唬鐮�": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"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": "",
@@ -1151,7 +1151,7 @@
//#endregion
//閫�鍑烘寜閽�
- form.on('submit(btn-Exit)', function (data) {
+ form.on('submit(btn-Exit)', function (data) {
sWhere = " and hmainid = " + $("#HInterID").val();
$.ajax({
url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
@@ -1338,7 +1338,7 @@
, 妫�楠岄」鐩唬鐮�: checkStatus.data[0].浠ｇ爜
, HQCCheckItemID: checkStatus.data[0].HItemID
, HResult: HResult
- });
+ });
$('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
form.render('select');
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1353,14 +1353,15 @@
}
}
//灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
- for (var i = 0; i < checkStatus.data.length; i++) {
+ for (var i = 0; i < checkStatus.data.length; i++) {
buttonArr.push({
"妫�楠岄」鐩�": checkStatus.data[i].鍚嶇О, "妫�楠岄」鐩唬鐮�": checkStatus.data[i].浠ｇ爜, "HQCCheckItemID": checkStatus.data[i].HItemID, "HResult": 1,
"HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "",
"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": ""
+ });
}
table.reload("mainTable", {
@@ -1378,7 +1379,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
-
+
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -1392,7 +1393,7 @@
妫�楠岄」鐩唬鐮�: OptionData[0].浠ｇ爜,
HQCCheckItemID: OptionData[0].HItemID,
HResult: 1
- });
+ });
$('#HResult' + rowIndex + '').find("option[value='" + 1 + "']").attr("selected", true);
form.render('select');
OptionData = [];
@@ -1439,8 +1440,8 @@
obj.update({
妫�楠屼华鍣ㄤ唬鐮�: OptionData[0].妫�楠屼华鍣ㄤ唬鐮�,
妫�楠屼华鍣�: OptionData[0].妫�楠屼华鍣ㄥ悕绉�,
- HInspectInstruMentID: OptionData[0].HItemID
- });
+ HInspectInstruMentID: OptionData[0].HItemID
+ });
OptionData = [];
}
}
@@ -1710,12 +1711,23 @@
//#endregion
//淇濆瓨
- function set_SaveBill(data) {
+ async function set_SaveBill(data) {
//璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
//Assignment(LastIndex, LastIndex);
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
- set_SaveValue($("#HEntryID").val());
+ try {
+ var rownum = $("#HEntryID").val();
+
+ rowFun = table.cache["mainTable"][rownum].HAnalysisMethod;
+ if (rowFun == "")
+ throw error
+ await set_SaveValue($("#HEntryID").val(), rowFun);
+ } catch (error) {
+
+ layer.msg('鐢ㄦ埛鍙栨秷浜嗘楠屽�间繚瀛�');
+ return;
+ }
if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -1776,12 +1788,12 @@
data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
- if (data.count == 1) {
+ if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
$('#set_CheckBill').removeClass("layui-btn-disabled").removeAttr("disabled").addClass("layui-btn-normal");
- if (isOpenBox=="1") {
+ if (isOpenBox == "1") {
layer.open({
type: 2,
skin: 'layui-layer-rim',
@@ -1920,8 +1932,8 @@
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
"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": 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].妫�楠屼緷鎹�,"HCompareSymbol":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": 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].妫�楠屼緷鎹�, "HCompareSymbol": data[i].姣旇緝绗�
}
)
@@ -2029,7 +2041,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID +'&HType=SIP'
+ , content: '../../鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID + '&HType=SIP'
, resize: false,
end: function () {
}
@@ -2037,7 +2049,7 @@
}
})
}
-
+
});
//#region 銆愯〃浣撴斁澶ч暅銆�
@@ -2348,7 +2360,7 @@
$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
trindex = result.data.length - 1;
- $("#HEntryID").val() - 1
+ $("#HEntryID").val() - 1
//鎼哄甫鍑烘娊鏍锋柟妗�
ReturnSampleScheme(data);
@@ -2376,7 +2388,7 @@
$("#HDownLimit").val(data[data.length - 1].涓嬮檺鍊�);
//姣旇緝绗�
$("#HComparator").val(data[data.length - 1].姣旇緝绗�);
-
+
if ($("#HEntryID").val() - 1 >= 0) {
option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].HSampleSchemeID;
@@ -2812,7 +2824,7 @@
, { field: 'HTargetVal', title: '鐩爣鍊�' }
, { field: 'HUpLimit', title: '涓婇檺鍊�' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�' }
- , { field: 'HCompareSymbol', title: '姣旇緝绗�'}
+ , { field: 'HCompareSymbol', title: '姣旇緝绗�' }
, { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
, { field: 'HMin', title: '鏈�灏忓��', edit: 'text', totalRow: true }
, { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
@@ -3107,6 +3119,9 @@
//#region 銆愬弻鍑绘楠岄」鐩浜嬩欢銆�
table.on('rowDouble(mainTable)', function (obj) {
+
+
+
$("#HInspectResultToSee").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
@@ -3117,6 +3132,11 @@
var nowindex = $(obj.tr).attr("data-index");
editIndex = Number(nowindex) + Number(1);
LastIndex = nowindex;
+ //#region
+
+ //#endregion
+
+
if (option_Check.length > 0) {
$("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
@@ -3127,7 +3147,7 @@
$("#HUpLimit").val(option_Check[nowindex].涓婇檺鍊�);
$("#HDownLimit").val(option_Check[nowindex].涓嬮檺鍊�);
$("#HComparator").val(option_Check[nowindex].姣旇緝绗�)
- }
+ }
//閫変腑琛屾敼鍙橀鑹�
@@ -3136,14 +3156,15 @@
var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
//鎶婃楠屽�兼暟鎹瓨鍒版暟缁�
//createArr(rowIndex);
-
+ var rowFun = table.cache["mainTable"][nowindex].HAnalysisMethod;
//鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
+
var table_value = table.cache['ValueTable'];
if (OperationType == 3) {
- set_SaveValue(Number(nowindex) + Number(1));
+ set_SaveValue(Number(nowindex) + Number(1), rowFun);
} else {
- set_SaveValue(dataindex + 1);
+ set_SaveValue(dataindex + 1, rowFun);
}
//璧嬪�间笌鍥炴樉
if ($("#HSampleSchemeID").val() != "0") {
@@ -3571,7 +3592,7 @@
HStatus: $("#HStatus").val(), //鐘舵��
HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
- //HCompareSymbol: $("#HCompareSymbol").val(),
+ //HCompareSymbol: $("#HCompareSymbol").val(),
HUnitID: $("#HUnitID").val(), //鍗曚綅ID
HUnit: $("#HUnit").val(), //鍗曚綅
HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
@@ -3649,7 +3670,7 @@
$("#HSampleSchemeID").val(0);
$("#HSampleSchemeName").val("");
- //HCompareSymbol: $("#HCompareSymbol").val();
+ //HCompareSymbol: $("#HCompareSymbol").val();
$("#HUnitID").val(0);
$("#HUnit").val("");
$("#HInspectVal").val("");
@@ -3697,7 +3718,7 @@
HStatus: $("#HStatus").val(), //鐘舵��
HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
- //HCompareSymbol: $("#HCompareSymbol").val(),
+ //HCompareSymbol: $("#HCompareSymbol").val(),
HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
HUnit: option.data[nowindex].HUnit,//鍗曚綅
HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
@@ -3859,8 +3880,8 @@
$("#HUnitID").val(maindata[nowindex].HUnitID);
$("#HUnit").val(maindata[nowindex].HUnit);
$("#HInspectVal").val(maindata[nowindex].HInspectVal);
- $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].鐩爣鍊� : "") : maindata[nowindex].HTargetVal );
- $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓婇檺鍊� : "") : maindata[nowindex].HUpLimit );
+ $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].鐩爣鍊� : "") : maindata[nowindex].HTargetVal);
+ $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓婇檺鍊� : "") : maindata[nowindex].HUpLimit);
$("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓嬮檺鍊� : "") : maindata[nowindex].HDownLimit);
$("#HComparator").val(maindata[nowindex].HCompareSymbol == "" ? (option_Check.length > 0 ? option_Check[nowindex].姣旇緝绗� : "=") : maindata[nowindex].HCompareSymbol);
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -3949,20 +3970,20 @@
var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
//var HEntryID = OperationType == 3 ? editIndex : $("#HEntryID").val() - 1;
if (UnRightQty > HAcceptQty) {
- $("#HResult" + (Number(HEntryID) )).val(2); //涓嶅悎鏍�
+ $("#HResult" + (Number(HEntryID))).val(2); //涓嶅悎鏍�
$("#HInspectResultToSee").val('涓嶅悎鏍�');
$("#HInspectResultToSee2").val('涓嶅悎鏍�');
$("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
} else {
- $("#HResult" + (Number(HEntryID) )).val(1); //鍚堟牸
+ $("#HResult" + (Number(HEntryID))).val(1); //鍚堟牸
$("#HInspectResultToSee").val('鍚堟牸');
$("#HInspectResultToSee2").val('鍚堟牸');
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
}
- form.render('select');
+ form.render('select');
} else {
option_Value.data = [{
"HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
@@ -4209,51 +4230,148 @@
form.render('select');
}
+ //淇濆瓨鎸夐挳
+ form.on('submit(btnSave)', function (data) {
+ set_SaveBill(data);
+ });
+ //妫�楠屽�间繚瀛� - 杩斿洖Promise
+ function set_SaveValue(dataindex, rowFun) {
+ return new Promise((resolve, reject) => {
+ var hasEmptyRow = false;
+ var emptyRowNumbers = [];
- //妫�楠屽�间繚瀛�
- function set_SaveValue(dataindex) {
- if (OperationType == 3) {
- EchoValue();
- }
- for (let i = 0; i < table.cache['ValueTable'].length; i++) {
- if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
- table.cache['ValueTable'][i].HInSpectValueB = 0
+ for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ var row = table.cache['ValueTable'][i];
+ if (rowFun == 2) {
+ if (
+ (!row.HInSpectValue || row.HInSpectValue === "")) {
+ hasEmptyRow = true;
+ emptyRowNumbers.push(i + 1);
+ }
+ }
}
- if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
- table.cache['ValueTable'][i].HInSpectValueT = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
- table.cache['ValueTable'][i].HInSpectValue = 0
- }
- }
- var sValueTable = JSON.stringify(table.cache['ValueTable']);
- var HInterID = $("#HInterID").val();
- var HEntryID = dataindex;
- var msg = sValueTable + ";" + HInterID + ";" + HEntryID
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
- async: true,
- data: { "msg": msg },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
+
+ if (hasEmptyRow) {
+ var confirmMsg = "妫�楠屽�艰〃鏍间腑瀛樺湪绌鸿锛堢 " + emptyRowNumbers.join(", ") + " 琛岋級锛屾槸鍚︾户缁繚瀛橈紵";
+ layer.confirm(confirmMsg, {
+ icon: 3,
+ title: '鎻愮ず',
+ btn: ['纭淇濆瓨', '鍙栨秷淇濆瓨']
+ }, function (index) {
+
layer.close(index);
- //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
- }
- else {
+ proceedWithSave(dataindex).then(resolve).catch(reject);
+ }, function (index) {
+ ////鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
+ //var dataindex = $("#HEntryID").val() - 1;
layer.close(index);
- layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //EchoValue();
+ layer.msg('宸插彇娑堜繚瀛橈紝璇峰畬鍠勬暟鎹悗閲嶆柊鎿嶄綔', { icon: 2 });
+ //reject(new Error('鐢ㄦ埛鍙栨秷浜嗕繚瀛�'));
+ });
+ } else {
+
+ proceedWithSave(dataindex).then(resolve).catch(reject);
}
});
}
+
+
+ function proceedWithSave(dataindex) {
+ return new Promise((resolve, reject) => {
+ if (OperationType == 3) {
+ EchoValue();
+ }
+
+
+ for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+ table.cache['ValueTable'][i].HInSpectValueB = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+ table.cache['ValueTable'][i].HInSpectValueT = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+ table.cache['ValueTable'][i].HInSpectValue = 0
+ }
+ }
+
+ var sValueTable = JSON.stringify(table.cache['ValueTable']);
+ var HInterID = $("#HInterID").val();
+ var HEntryID = dataindex;
+ var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+ async: true,
+ data: { "msg": msg },
+ dataType: "json",
+ success: function (data) {
+ layer.close(index);
+ if (data.count == 1) {
+ layer.msg('妫�楠屽�间繚瀛樻垚鍔�', { icon: 1 });
+ resolve(); // 鎴愬姛鏃秗esolve
+ } else {
+ layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + data.Message));
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + err));
+ }
+ });
+ });
+ }
+ //妫�楠屽�间繚瀛�
+ //function set_SaveValue(dataindex) {
+ // if (OperationType == 3) {
+ // EchoValue();
+ // }
+ // for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ // if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+ // table.cache['ValueTable'][i].HInSpectValueB = 0
+ // }
+ // if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+ // table.cache['ValueTable'][i].HInSpectValueT = 0
+ // }
+ // if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+ // table.cache['ValueTable'][i].HInSpectValue = 0
+ // }
+ // }
+
+ // var sValueTable = JSON.stringify(table.cache['ValueTable']);
+ // var HInterID = $("#HInterID").val();
+ // var HEntryID = dataindex;
+ // var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+ // var index = layer.load();
+ // $.ajax({
+ // type: "POST",
+ // url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+ // async: false,
+ // data: { "msg": msg },
+ // dataType: "json",
+ // success: function (data) {
+ // if (data.count == 1) {
+ // layer.close(index);
+ // //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+ // }
+ // else {
+ // layer.close(index);
+ // layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // },
+ // error: function (err) {
+ // layer.close(index);
+ // layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // });
+ //}
//鏍规嵁鐢熶骇璧勬簮鎴栬�� 宸ュ簭 鏌ヨ鐢熶骇宸ュ崟淇℃伅
function get_ICMOBillStatusList() {
@@ -4518,7 +4636,7 @@
url: GetWEBURL() + "/Web/GetCheckItemID",
type: "GET",
async: false,
- data: { "HName": HName, "HProName": HProName,"HSourceID": HSourceID },
+ data: { "HName": HName, "HProName": HProName, "HSourceID": HSourceID },
success: function (result) {
if (result.code == 1) {
$("#HQCSchemeID").val(result.data[0].hmainid);
@@ -4571,7 +4689,7 @@
var LoadData = data.data;
$("#HShiftsID").val(LoadData[0].HInterID); //褰撳墠宸ュ簭ID
$("#HShiftsName").val(LoadData[0].鐝); //褰撳墠宸ュ簭
- }
+ }
},
error: function (err) {
layer.alert(err, { icon: 5 });
@@ -4655,7 +4773,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["HQCCheckItemID","HInspectInstruMentID"];
+ var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];
dataCol = data1.data[0].HGridString.split(',');
@@ -4677,7 +4795,7 @@
option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
} else {
option.cols[0][i + 1]["style"] += "font-size:100%";
- }
+ }
//鏄剧ず鍒�
if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
option.cols[0][i + 1]["hide"] = false;
@@ -4776,9 +4894,9 @@
$("#HShiftsID").val(obj[0].HInterID);
}
//宸ュ簭
- function GetProcessValue (obj) {
+ function GetProcessValue(obj) {
$("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
- $("#HProcID").val(obj[0].HItemID);
+ $("#HProcID").val(obj[0].HItemID);
}
//璁￠噺鍗曚綅
function GetHUnitListValue(obj) {
@@ -4798,7 +4916,7 @@
$("#HDownLimit").val(obj.妫�娴嬪�煎悕绉�);
}
//妫�楠岄」鐩�
- function GetCheckItemValue (obj) {
+ function GetCheckItemValue(obj) {
OptionData = obj;
}
//妫�楠屼华鍣�
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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
index 08cb73c..e016948 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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
@@ -506,10 +506,10 @@
sWhere += " and DSN like '%" + HBarcode_SN + "%'";
}
if (HBarcode_ZB) {
- sWhere += " and 鏍堟澘鐮� like '%" + HBarcode_ZB + "%'";
+ sWhere += "and 绠″埗搴忓彿 like 'P%' and 绠″埗搴忓彿 like '%XXX' and 绠″埗搴忓彿='" + HBarcode_ZB+"'";
}
if (HBarcode_ZX) {
- sWhere += " and 涓鐮� like '%" + HBarcode_ZX + "%'";
+ sWhere += "and 绠″埗搴忓彿 like 'MZXH%' and 绠″埗搴忓彿='" + HBarcode_ZX+"'";
}
get_Display(sWhere);
@@ -533,7 +533,8 @@
$("#ColName2").val("0");
$("#Comparator2").val("0");
form.render('select');
-
+
+ get_FastQuery("")
sWhere = "";
}
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html"
index 3ef15f1..17336ab 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html"
@@ -327,12 +327,12 @@
}
//鍔犺浇缃戞牸
- function get_Display(txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere) {
+ function get_Display(HDate1,HDate2,txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere) {
var wait = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_Tk',
type: "GET",
- data: {"txtHOrderProcNo": txtHOrderProcNo, "txtHMaterNumber": txtHMaterNumber, "check": check, "txtHDeptName": txtHDeptName, "sWhere": sWhere },
+ data: { "HDate1": HDate1, "HDate2": HDate2,"txtHOrderProcNo": txtHOrderProcNo, "txtHMaterNumber": txtHMaterNumber, "check": check, "txtHDeptName": txtHDeptName, "sWhere": sWhere },
success: function (data1) {
var col = [];
if (data1.count == 1) {
@@ -385,7 +385,8 @@
function get_FastQuery() {
var HDate1 = $("#HDate1").val();
var HDate2 = $("#HDate2").val();
- sWhere = "and 宸ュ簭瀹屽伐鏃ユ湡1 >='" + HDate1 + "' and 宸ュ簭瀹屽伐鏃ユ湡1<='" + HDate2 + "'";
+ sWhere = "";
+ //sWhere = "and 宸ュ簭瀹屽伐鏃ユ湡1 >='" + HDate1 + "' and 宸ュ簭瀹屽伐鏃ユ湡1<='" + HDate2 + "'";
var txtHOrderProcNo = $("#txtHOrderProcNo").val();//璁㈠崟璺熻釜鍙�
var txtHMaterNumber = $("#txtHMaterNumber").val(); //鐗╂枡
var txtHDeptName = $("#txtHDeptName").val(); //鐗╂枡
@@ -469,7 +470,7 @@
sWhere += " and " + ColName2 + " " + com2;
}
- get_Display(txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere);
+ get_Display(HDate1,HDate2,txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere);
//sWhere = "'" + HDate1 + "','" + HDate2 + "','" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'";
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
--
Gitblit v1.9.1