From a953485c61270e66dd05057ff8622ad28c7c06b5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 26 一月 2024 14:16:45 +0800
Subject: [PATCH] PDA（工序/首件检验单）增加检验项目页签
---
WebTM/views/车间管理/工序流转/MES_ColorRecordBill_PDA.html | 287 +++++++++++++++----------
WebTM/views/质量管理/工序检验单/MES_ProcessCheckBill_PDA.html | 324 ++++++++++++++++++++++-------
2 files changed, 413 insertions(+), 198 deletions(-)
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/MES_ProcessCheckBill_PDA.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/MES_ProcessCheckBill_PDA.html"
index 1617e4a..377ffac 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/MES_ProcessCheckBill_PDA.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/MES_ProcessCheckBill_PDA.html"
@@ -17,69 +17,13 @@
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<!--鑷畾涔夋牱寮�-->
<style>
- /* .maintitle {
- background-color: #1492ff;
- color: #fff;
- padding: 5px 10px;
- border: none;
- border-radius: 4px;
- }
-
- .title {
- border-left: 4px solid #1492ff;
- padding-left: 6px;
- margin: 20px 10px 4px;
- font-size: 16px;
- color: #333;
- }
-
- .buttom_box_little {
- width: 60px;
- height: 36px;
- color: #fff;
- background-color: #1492ff;
- border-radius: 4px;
- border: none;
- margin: 10px;
- }
-
- .layui-input {
- width: 93%;
- }
-
- .layui-inline, img {
- display: block;
- vertical-align: middle
- }
-
- .layui-input, .layui-textarea {
- display: inline-block;
- width: 100%;
- padding-left: 10px;
- }
-
- .laydate-time-list ol {
- overflow-x: hidden !important;
- overflow-y: auto !important;
- }
-
- .layui-form-label {
- padding: 9px 5px;
- width: 85px;
- }
-
- .layui-input-block {
- margin-left: 85px;
- min-height: 36px;
- }*/
-
.layui-form-label {
font-size: 14px;
width: 85px;
text-align: inherit;
}
/*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
- .layui-input {
+ .set_height {
height: 30px;
}
/*璁剧疆琛ㄥご杈撳叆妗�*/
@@ -101,6 +45,21 @@
th {
width: 70px;
text-align: left;
+ }
+
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ /*鏄庣粏琛屽閫夋灞呬腑*/
+ .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+ margin-left: 35%;
}
</style>
</head>
@@ -128,21 +87,21 @@
<tr>
<th>鏉″舰鐮�</th>
<td class="bz_td">
- <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
+ <input type="text" name="HBarCode" class="layui-input set_height" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
</td>
</tr>
<tr>
<th>鏁伴噺</th>
<td class="bz_td">
- <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ユ暟閲�" style="border-radius: 50px;">
+ <input type="text" name="HQty" class="layui-input set_height" id="HQty" value="0" placeholder="璇疯緭鍏ユ暟閲�" style="border-radius: 50px;">
</td>
</tr>
<tr>
<th>鐢熶骇璧勬簮</th>
<td class="bz_td">
- <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px; background-color: #efefef4d;">
- <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HSourceName" class="layui-input set_height" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px; background-color: #efefef4d;">
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input set_height">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder;">...</button>
</td>
</tr>
@@ -156,72 +115,111 @@
<tr>
<th>鍗曟嵁鏃ユ湡</th>
<td class="t1_input">
- <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡" readonly>
+ <input type="text" name="HDate" class="layui-input set_height" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡" readonly>
</td>
</tr>
<tr>
<th>鍗曟嵁鍙�</th>
<td class="bz_td">
- <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HBillNo" class="layui-input set_height" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input set_height">
</td>
</tr>
<tr>
<th>鐢熶骇缁勭粐</th>
<td class="bz_td">
- <input type="text" name="HPRDORGName" class="layui-input" id="HPRDORGName" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HPRDORGID" id="HPRDORGID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HPRDORGName" class="layui-input set_height" id="HPRDORGName" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" value="0" autocomplete="off" class="layui-input set_height">
</td>
</tr>
<tr>
<th>鐢熶骇璁㈠崟鍙�</th>
<td class="bz_td">
- <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HICMOBillNo" class="layui-input set_height" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input set_height">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0" autocomplete="off" class="layui-input set_height">
</tr>
<tr>
<th>娴佽浆鍗�</th>
<td class="bz_td">
- <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="鎸囧紩鍗�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HProcExchHinteID" class="layui-input" id="HProcExchHinteID">
+ <input type="text" name="HProcExchBillNo" class="layui-input set_height" id="HProcExchBillNo" placeholder="鎸囧紩鍗�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcExchHinteID" class="layui-input set_height" id="HProcExchHinteID">
</td>
</tr>
<tr>
<th>鐗╂枡浠ｇ爜</th>
<td class="bz_td">
- <input type="text" name="HMaterNumber" class="layui-input" id="HMaterNumber" placeholder="浜у搧浠ｇ爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMaterID" class="layui-input" id="HMaterID">
+ <input type="text" name="HMaterNumber" class="layui-input set_height" id="HMaterNumber" placeholder="浜у搧浠ｇ爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" class="layui-input set_height" id="HMaterID">
</td>
</tr>
<tr>
<th>鐗╂枡鍚嶇О</th>
<td class="bz_td">
- <input type="text" name="HMaterName" class="layui-input" id="HMaterName" value="" placeholder="鐗╂枡鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HMaterName" class="layui-input set_height" id="HMaterName" value="" placeholder="鐗╂枡鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>瑙勬牸鍨嬪彿</th>
<td class="bz_td">
- <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HMaterModel" class="layui-input set_height" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>璁￠噺鍗曚綅</th>
<td class="bz_td">
- <input type="text" name="HUnitName" class="layui-input" id="HUnitName" placeholder="閫夋嫨璁￠噺鍗曚綅" style="border-radius: 50px; background-color: #efefef4d;">
- <input type="hidden" name="HUnitID" id="HUnitID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HUnitName" class="layui-input set_height" id="HUnitName" placeholder="閫夋嫨璁￠噺鍗曚綅" style="border-radius: 50px; background-color: #efefef4d;">
+ <input type="hidden" name="HUnitID" id="HUnitID" value="0" autocomplete="off" class="layui-input set_height">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="BtnHUnit" id="BtnHUnit" style="font-weight:bolder">...</button>
</td>
</tr>
<tr>
<th>宸ュ簭</th>
<td class="bz_td">
- <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="閫夋嫨宸ュ簭" style="background-color:#efefef4d;border-radius: 50px;">
- <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HProcName" class="layui-input set_height" id="HProcName" placeholder="閫夋嫨宸ュ簭" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input set_height">
</td>
</tr>
</tbody>
</table>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-inline" style="margin-bottom:5px;">
+ <label class="layui-form-label" style="width:100px;">妫�楠屾柟妗�</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HQCSchemeName" id="HQCSchemeName" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="btnSearchQCScheme" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <!--搴忓彿-->
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <!--鍒犻櫎-->
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+ <script type="text/html" id="HAnalysisMethod">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+ </script>
+ <!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
+ <script type="text/html" id="HKeyInspect">
+ <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
+ </script>
+ <!--澶嶉�夋锛堢粨鏋滐級-->
+ <script type="text/html" id="HResult">
+ <input type="checkbox" value="{{d.HResult}}" lay-skin="primary" id="HResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HResult" {{ d.HResult == 1 ? 'checked' : '' }}>
+ </script>
</div>
<div class="layui-tab-item">
<table style="width:80%;">
@@ -280,6 +278,7 @@
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍗曟嵁淇℃伅</li>
+ <li>妫�楠岄」鐩�</li>
<li>鍒跺崟淇℃伅</li>
</ul>
</div>
@@ -330,7 +329,8 @@
var HBillNo = params[params[3]]; //鑾峰彇鍗曟嵁鍙�
var closeType = params[params[4]]; //鍏抽棴绫诲瀷
}
-
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
$("#HInterID").val("");
@@ -426,6 +426,45 @@
})
});
+ //琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
+ form.on('submit(btnSearchQCScheme)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟妗堝垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
+ $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
+ get_CheckItem();
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
if (!HProcExchBillNoFlag) {
@@ -448,9 +487,131 @@
location.replace('MES_ProcessCheckBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
});
})
+ //琛岄�夋嫨澶勭悊锛堝垎鏋愭柟娉曪級
+ form.on('select(HAnalysisMethod)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏄惁閲嶇偣妫�鏌�
+ form.on('checkbox(HKeyInspect)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HKeyInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏄惁鍚堟牸
+ form.on('checkbox(HResult)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HResult = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆琛ㄦ牸鏁版嵁
+ rowdata = [{
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0,
+ }];
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , height: 'full-50'
+ , cellMinWidth: 150
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
+ , { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
+ , { field: 'HResult', title: '妫�楠岀粨鏋�', width: 80, templet: '#HResult', unresize: false }
+ , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', width: 100, templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+ , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', width: 80, templet: '#HKeyInspect', unresize: false }
+ , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID', hide: true }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+ , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
+ , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+ , { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
+ , { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
+ , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 60 }
+ ]]
+ , done: function (res, curr, count) {
+ option.data = res.data;
+ //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ $('.layui-form-select').find('input').unbind("blur");
+ //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ //$cr.find('input').val(value.HResult);
+ }
+ });
+ });
+ }
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ //鍔犺浇绌鸿〃鏍�
+ option.data = rowdata;
+ table.render(option);
+ }
+
+ function get_CheckItem() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+ type: "GET",
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": 0 },
+ success: function (result) {
+ if (result.code == 1) {
+ var rowdata = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push(
+ {
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"] == 1 ? true : false,
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0
+ }
+ );
+ }
+ //妫�楠岄」鐩�
+ option.data = rowdata;
+ table.render(option);
+ for (var i = 1; i <= result.data.length; i++) {
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ }
+ form.render('select');
+ }
+ }
+ })
+ }
function txtHBarCode_KeyDown(HBarCode) {
//鎵爜绫诲瀷2
@@ -469,6 +630,7 @@
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcExchBillNo": data.鍗曟嵁鍙�,
"HICMOInterID": data.hicmointerid,
+ "HICMOEntryID": data.HICMOEntryID,
"HICMOBillNo": data.浠诲姟鍗曞彿,
"HMaterID": data.HMaterID,
"HMaterName": data.浜у搧,
@@ -506,7 +668,9 @@
//淇濆瓨
function Get_Save(data) {
var tableData = data.field;
- var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType + ";" + sSubStr;
+
var index = layer.load();
$.ajax({
type: "POST",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
index 840f37c..a649322 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
@@ -23,7 +23,7 @@
text-align: inherit;
}
/*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
- .layui-input {
+ .set_height {
height: 30px;
}
/*璁剧疆琛ㄥご杈撳叆妗�*/
@@ -83,21 +83,21 @@
<tr>
<th>鏉″舰鐮�</th>
<td class="bz_td">
- <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
+ <input type="text" name="HBarCode" class="layui-input set_height" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
</td>
</tr>
<tr>
<th>鏁伴噺</th>
<td class="bz_td">
- <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ユ暟閲�" style="border-radius: 50px;">
+ <input type="text" name="HQty" class="layui-input set_height" id="HQty" value="0" placeholder="璇疯緭鍏ユ暟閲�" style="border-radius: 50px;">
</td>
</tr>
<tr>
<th>鐢熶骇璧勬簮</th>
<td class="bz_td">
- <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px; background-color: #efefef4d;">
- <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HSourceName" class="layui-input set_height" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px; background-color: #efefef4d;">
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input set_height">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder;">...</button>
</td>
</tr>
@@ -111,87 +111,111 @@
<tr>
<th>鍗曟嵁鏃ユ湡</th>
<td class="t1_input">
- <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡" readonly>
+ <input type="text" name="HDate" class="layui-input set_height" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡" readonly>
</td>
</tr>
<tr>
<th>鍗曟嵁鍙�</th>
<td class="bz_td">
- <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HBillNo" class="layui-input set_height" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input set_height">
</td>
</tr>
<tr>
<th>鐢熶骇缁勭粐</th>
<td class="bz_td">
- <input type="text" name="HPRDORGName" class="layui-input" id="HPRDORGName" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HPRDORGID" id="HPRDORGID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HPRDORGName" class="layui-input set_height" id="HPRDORGName" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" value="0" autocomplete="off" class="layui-input set_height">
</td>
</tr>
<tr>
<th>鐢熶骇璁㈠崟鍙�</th>
<td class="bz_td">
- <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
- </tr>
+ <input type="text" name="HICMOBillNo" class="layui-input set_height" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input set_height">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0" autocomplete="off" class="layui-input set_height">
+</tr>
<tr>
<th>鎸囧紩鍗�</th>
<td class="bz_td">
- <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="鎸囧紩鍗�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HProcExchHinteID" class="layui-input" id="HProcExchHinteID">
+ <input type="text" name="HProcExchBillNo" class="layui-input set_height" id="HProcExchBillNo" placeholder="鎸囧紩鍗�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcExchHinteID" class="layui-input set_height" id="HProcExchHinteID">
</td>
</tr>
<tr>
<th>鐗╂枡浠ｇ爜</th>
<td class="bz_td">
- <input type="text" name="HMaterNumber" class="layui-input" id="HMaterNumber" placeholder="浜у搧浠ｇ爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMaterID" class="layui-input" id="HMaterID">
+ <input type="text" name="HMaterNumber" class="layui-input set_height" id="HMaterNumber" placeholder="浜у搧浠ｇ爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" class="layui-input set_height" id="HMaterID">
</td>
</tr>
<tr>
<th>鐗╂枡鍚嶇О</th>
<td class="bz_td">
- <input type="text" name="HMaterName" class="layui-input" id="HMaterName" value="" placeholder="鐗╂枡鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HMaterName" class="layui-input set_height" id="HMaterName" value="" placeholder="鐗╂枡鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>瑙勬牸鍨嬪彿</th>
<td class="bz_td">
- <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HMaterModel" class="layui-input set_height" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>璁￠噺鍗曚綅</th>
<td class="bz_td">
- <input type="text" name="HUnitName" class="layui-input" id="HUnitName" placeholder="閫夋嫨璁￠噺鍗曚綅" style="border-radius: 50px; background-color: #efefef4d;">
- <input type="hidden" name="HUnitID" id="HUnitID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HUnitName" class="layui-input set_height" id="HUnitName" placeholder="閫夋嫨璁￠噺鍗曚綅" style="border-radius: 50px; background-color: #efefef4d;">
+ <input type="hidden" name="HUnitID" id="HUnitID" value="0" autocomplete="off" class="layui-input set_height">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="BtnHUnit" id="BtnHUnit" style="font-weight:bolder">...</button>
</td>
</tr>
<tr>
<th>宸ュ簭</th>
<td class="bz_td">
- <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="閫夋嫨宸ュ簭" style="background-color:#efefef4d;border-radius: 50px;">
- <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HProcName" class="layui-input set_height" id="HProcName" placeholder="閫夋嫨宸ュ簭" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input set_height">
</td>
</tr>
</tbody>
</table>
- </div>
+ </div>
<div class="layui-tab-item">
- <table style="width:80%;">
- <tbody>
- <tr>
- <th>妫�楠屾柟妗�</th>
- <td class="bz_td">
- <input type="text" name="HQCSchemeName" class="layui-input" id="HQCSchemeName" placeholder="閫夋嫨妫�楠屾柟妗�" style="border-radius: 50px; background-color: #efefef4d;">
- <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0" autocomplete="off" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" style="font-weight:bolder;">...</button>
- </td>
- </tr>
- </tbody>
- </table>
+ <div class="layui-inline" style="margin-bottom:5px;">
+ <label class="layui-form-label" style="width:100px;">妫�楠屾柟妗�</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HQCSchemeName" id="HQCSchemeName" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="btnSearchQCScheme" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <!--搴忓彿-->
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <!--鍒犻櫎-->
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+ <script type="text/html" id="HAnalysisMethod">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+ </script>
+ <!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
+ <script type="text/html" id="HKeyInspect">
+ <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
+ </script>
+ <!--澶嶉�夋锛堢粨鏋滐級-->
+ <script type="text/html" id="HResult">
+ <input type="checkbox" value="{{d.HResult}}" lay-skin="primary" id="HResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HResult" {{ d.HResult == 1 ? 'checked' : '' }}>
+ </script>
</div>
<div class="layui-tab-item">
<table style="width:80%;">
@@ -199,49 +223,49 @@
<tr>
<th>鍒跺崟浜�</th>
<td class="bz_td">
- <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HMaker" class="layui-input set_height" id="HMaker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>鍒跺崟鏃ユ湡</th>
<td class="bz_td">
- <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HMakeDate" class="layui-input set_height" id="HMakeDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>淇敼浜�</th>
<td class="bz_td">
- <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HUpDater" class="layui-input set_height" id="HUpDater" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>淇敼鏃ユ湡</th>
<td class="bz_td">
- <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HUpDateDate" class="layui-input set_height" id="HUpDateDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>瀹℃牳浜�</th>
<td class="bz_td">
- <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HChecker" class="layui-input set_height" id="HChecker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>瀹℃牳鏃ユ湡</th>
<td class="bz_td">
- <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HCheckDate" class="layui-input set_height" id="HCheckDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>浣滃簾浜�</th>
<td class="bz_td">
- <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HDeleteMan" class="layui-input set_height" id="HDeleteMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>浣滃簾鏃ユ湡</th>
<td class="bz_td">
- <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="text" name="HDeleteDate" class="layui-input set_height" id="HDeleteDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
</tbody>
@@ -267,28 +291,6 @@
</div>
</body>
</html>
-<!--琛屾寜閽�-->
-<script type="text/html" id="barDemo">
- <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
-</script>
-<!--澶嶉�夋锛堟楠岀粨璁猴級-->
-<script type="text/html" id="HResult">
- <input type="checkbox" value="{{d.HResult}}" lay-skin="primary" id="HResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HResult" {{ d.HResult == 1 ? 'checked' : '' }}>
-</script>
-<!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
-<script type="text/html" id="HKeyInspect">
- <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
-</script>
-<!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
-<script type="text/html" id="HAnalysisMethod">
- <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
- <option value="">璇烽�夋嫨</option>
- <option value="1">瀹氭�у垎鏋�</option>
- <option value="2">瀹氶噺鍒嗘瀽</option>
- <option value="3">鍏朵粬鍒嗘瀽</option>
- </select>
-</script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -323,6 +325,9 @@
var HBillNo = params[params[3]]; //鑾峰彇鍗曟嵁鍙�
var closeType = params[params[4]]; //鍏抽棴绫诲瀷
}
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
@@ -391,44 +396,7 @@
}
})
});
-
- //琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
- form.on('submit(btnSearchQCScheme)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- area: ['90%', '90%'],
- title: '妫�楠屾柟妗堝垪琛�',
- shift: 2,//寮瑰嚭鍔ㄧ敾,
- maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
- $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
- get_CheckItem();
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- },
- success: function (layero, index) {
-
- }
- });
- });
-
+
//閫夋嫨璁￠噺鍗曚綅
form.on('submit(BtnHUnit)', function () {//鐢熶骇璧勬簮
layer.open({
@@ -457,6 +425,45 @@
})
});
+ //琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
+ form.on('submit(btnSearchQCScheme)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟妗堝垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
+ $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
+ get_CheckItem();
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
if (!HProcExchBillNoFlag) {
@@ -479,15 +486,54 @@
location.replace('MES_ColorRecordBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
});
})
+
+ //琛岄�夋嫨澶勭悊锛堝垎鏋愭柟娉曪級
+ form.on('select(HAnalysisMethod)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏄惁閲嶇偣妫�鏌�
+ form.on('checkbox(HKeyInspect)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HKeyInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏄惁鍚堟牸
+ form.on('checkbox(HResult)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HResult = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
+ //鍒濆鍖栬〃鏍�
function set_InitGrid() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "", "HMax": "", "HMin": "", "HAvg": "", "HKeyInspect": false
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0,
}];
option = {
elem: '#mainTable'
@@ -500,18 +546,18 @@
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
+ , { field: 'HResult', title: '妫�楠岀粨鏋�', width: 80, templet: '#HResult', unresize: false }
+ , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', width: 100, templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+ , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', width: 80, templet: '#HKeyInspect', unresize: false }
, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
- , { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
- , { field: 'HResult', title: '缁撹', width: 70, templet: '#HResult' }
- , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
- , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
+ , { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID', hide: true }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
, { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
, { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
, { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 60 }
]]
, done: function (res, curr, count) {
option.data = res.data;
@@ -523,7 +569,7 @@
var dataIndex = $cr.attr("data-index");
$.each(option.data, function (index, value) {
if (value.LAY_TNDEX == dataIndex) {
- $cr.find('input').val(value.HResult);
+ //$cr.find('input').val(value.HResult);
}
});
});
@@ -545,25 +591,28 @@
success: function (result) {
if (result.code == 1) {
var rowdata = [];
- rowdata_Value = [];
var data = result.data;
for (var i = 0; i < result.data.length; i++) {
//瀛愯〃 璧嬪��
rowdata.push(
{
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
- "HMax": "", "HMin": "", "HAvg": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"] == 1 ? true : false,
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0
}
);
}
//妫�楠岄」鐩�
option.data = rowdata;
table.render(option);
+ for (var i = 1; i <= result.data.length; i++) {
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ }
+ form.render('select');
}
}
})
}
-
+
function txtHBarCode_KeyDown(HBarCode) {
//鎵爜绫诲瀷2
var barNo2 = HBarCode.substr(0, 4);
@@ -581,6 +630,7 @@
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcExchBillNo": data.鍗曟嵁鍙�,
"HICMOInterID": data.hicmointerid,
+ "HICMOEntryID": data.HICMOEntryID,
"HICMOBillNo": data.浠诲姟鍗曞彿,
"HMaterID": data.HMaterID,
"HMaterName": data.浜у搧,
@@ -616,7 +666,8 @@
//淇濆瓨
function Get_Save(data) {
var tableData = data.field;
- var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType + ";" + sSubStr;
var index = layer.load();
$.ajax({
type: "POST",
--
Gitblit v1.9.1