From 02af6ea33f505e4e06dc91785154898a801b267d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 14 四月 2025 12:21:56 +0800
Subject: [PATCH] 修复出站单 第三个自定义过滤没有数据显示，完善生产质量汇报单 复制一行不显示，修复不良原因查询在其他页面打开报错，性能散点报表 增加生产资源过滤，设备工艺参数点检表 完善 初始化点检人 id未赋值
---
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 922 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 864 insertions(+), 58 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index ef52968..97ce444 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
@@ -21,8 +21,7 @@
/*padding: 0 2px;*/ /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
/*height: 30px;
line-height: 30px;
- }*/
-
+ }*/
.btn-title {
font-size: 16px;
}
@@ -77,6 +76,7 @@
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" value="0">
+ <input type="hidden" name="HBillSubType" id="HBillSubType" value="0">
<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" value="0" lay-verify="HSTOCKORGID">
</div>
</div>
@@ -87,9 +87,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐧昏浜�</label>
+ <label class="layui-form-label">鐧昏浜�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -231,9 +231,9 @@
<script type="text/html" id="toolbarDemo">
<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-InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><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-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>
@@ -252,12 +252,54 @@
<!--琛屼笅鎷夐�夋嫨(鍒ゅ畾缁撴灉)-->
<script type="text/html" id="HResult">
<select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}">
- <option value="涓嶈壇">涓嶈壇</option>
<option value="鎶ュ簾">鎶ュ簾</option>
+ <option value="杩斿伐">杩斿伐</option>
+ <option value="鐗归噰">鐗归噰</option>
+ <option value="鏀捐">鏀捐</option>
+ <option value="宸ュ簾">宸ュ簾</option>
+ <option value="鏂欏簾">鏂欏簾</option>
+ <option value="鏍蜂欢淇濈暀">鏍蜂欢淇濈暀</option>
+ <option value="">璇烽�夋嫨</option>
</select>
+ </script>
+ <!--鐗╂枡浠ｇ爜鍗曞厓鏍兼寜閽�-->
+ <script type="text/html" id="HMaterNumberbtn">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber{{d.LAY_TABLE_INDEX+1}}" style="float:left;width:105px;height:175%;margin: -5px -5px -30px -15px !important"><!--涓婂彸涓嬪乏-->
+ <a class="layui-btn layui-btn-xs layui-btn-normal" layui-icon-search lay-event="HMaterNumberbtn" style="float:right;width:35px;height:38px; background-color:transparent;border-style:none;color:black;font-size:20px;">...</a>
+ </script>
+ <!--褰撳墠宸ュ簭鍗曞厓鏍兼寜閽�-->
+ <script type="text/html" id="HNowProcNamebtn">
+ <input type="text" class="layui-input" name="HNowProcName" id="HNowProcName{{d.LAY_TABLE_INDEX+1}}" style="float:left;width:105px;height:175%;margin: -5px -5px -30px -15px !important"><!--涓婂彸涓嬪乏-->
+ <a class="layui-btn layui-btn-xs layui-btn-normal" layui-icon-search lay-event="HNowProcNamebtn" style="float:right;width:35px;height:38px; background-color:transparent;border-style:none;color:black;font-size:20px;">...</a>
+ </script>
+ <!--璐ｄ换宸ュ簭鍗曞厓鏍兼寜閽�-->
+ <script type="text/html" id="HBadProcNamebtn">
+ <input type="text" class="layui-input" name="HBadProcName" id="HBadProcName{{d.LAY_TABLE_INDEX+1}}" style="float:left;width:105px;height:175%;margin: -5px -5px -30px -15px !important"><!--涓婂彸涓嬪乏-->
+ <a class="layui-btn layui-btn-xs layui-btn-normal" layui-icon-search lay-event="HBadProcNamebtn" style="float:right;width:35px;height:38px; background-color:transparent;border-style:none;color:black;font-size:20px;">...</a>
+ </script>
+ <!--妫�楠屽憳鍗曞厓鏍兼寜閽�-->
+ <script type="text/html" id="HEmpNamebtn">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName{{d.LAY_TABLE_INDEX+1}}" style="float:left;width:105px;height:175%;margin: -5px -5px -30px -15px !important"><!--涓婂彸涓嬪乏-->
+ <a class="layui-btn layui-btn-xs layui-btn-normal" layui-icon-search lay-event="HEmpNamebtn" style="float:right;width:35px;height:38px; background-color:transparent;border-style:none;color:black;font-size:20px;">...</a>
+ </script>
+ <!--鐢熶骇璧勬簮鍗曞厓鏍兼寜閽�-->
+ <script type="text/html" id="HSourceNamebtn">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName{{d.LAY_TABLE_INDEX+1}}" style="float:left;width:105px;height:175%;margin: -5px -5px -30px -15px !important"><!--涓婂彸涓嬪乏-->
+ <a class="layui-btn layui-btn-xs layui-btn-normal" layui-icon-search lay-event="HSourceNamebtn" style="float:right;width:35px;height:38px; background-color:transparent;border-style:none;color:black;font-size:20px;">...</a>
+ </script>
+ <!--涓嶈壇鍘熷洜鍗曞厓鏍兼寜閽�-->
+ <script type="text/html" id="HBadReasonbtn">
+ <input type="text" class="layui-input" name="HBadReason" id="HBadReason{{d.LAY_TABLE_INDEX+1}}" style="float:left;width:105px;height:175%;margin: -5px -5px -30px -15px !important"><!--涓婂彸涓嬪乏-->
+ <a class="layui-btn layui-btn-xs layui-btn-normal" layui-icon-search lay-event="HBadReasonbtn" style="float:right;width:35px;height:38px; background-color:transparent;border-style:none;color:black;font-size:20px;">...</a>
+ </script>
+ <!--涓嶈壇鐜拌薄鍗曞厓鏍兼寜閽�-->
+ <script type="text/html" id="HBadPhenomenabtn">
+ <input type="text" class="layui-input" name="HBadPhenomena" id="HBadPhenomena{{d.LAY_TABLE_INDEX+1}}" style="float:left;width:105px;height:175%;margin: -5px -5px -30px -15px !important"><!--涓婂彸涓嬪乏-->
+ <a class="layui-btn layui-btn-xs layui-btn-normal" layui-icon-search lay-event="HBadPhenomenabtn" style="float:right;width:35px;height:38px; background-color:transparent;border-style:none;color:black;font-size:20px;">...</a>
</script>
<script>
//#region 鎶樺彔娉ㄩ噴
+ var HDataTemp = {};
//#endregion
layui.config({
base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -276,28 +318,34 @@
//瀛愯〃娓叉煋鍙傛暟
var option = {};
-
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HBillSubType = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁瀛愮被鍨�
+ var HEntryID = params[params[4]]; //鑾峰彇鍗曟嵁瀛恑d
+ //#endregion
+
+
+
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "3717";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ if (HBillSubType == '3717-1') {
+ var HPageTitle = "寰憰鍝佽褰曞崟";
+ } else {
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ }
$("h1").html('<b>' + HPageTitle + '</b>');
//#endregion
//妯″潡鍚�
var HModName = "Sc_QualityReportStepBill_New";
var HBillType = "3717";
-
- //鑾峰彇椤甸潰璺宠浆鍙傛暟
- var params = get_UrlVars();
- var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
- var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var HEntryID = params[params[4]]; //鑾峰彇鍗曟嵁瀛恑d
- //#endregion
-
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -321,6 +369,16 @@
//瀛愯〃鍒濆鍖�
set_InitGrid();
setInit_PushByICMOBill(linterid);
+ }
+ else if (OperationType == 5) { //娴佽浆鍗′笅鎺�
+ //瀛愯〃鍒濆鍖�
+ set_InitGrid();
+ set_ProcessBill(linterid, HEntryID);
+ }
+ else if (OperationType == 6) { //鍑虹珯姹囨姤鍗曚笅鎺�
+ //瀛愯〃鍒濆鍖�
+ set_InitGrid();
+ set_StationOutBill(linterid);
}
//#endregion
@@ -375,7 +433,6 @@
}
//#endregion
}
-
if (AllowLoadData(data)) {
set_SaveBill(data);
}
@@ -403,7 +460,7 @@
//#region 瀛愯〃1锛氬ご宸ュ叿鏍忔寜閽Е鍙戜簨浠�
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;;
+ , data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
@@ -411,16 +468,24 @@
"鐗╂枡浠ｇ爜": "",
"鐗╂枡鍚嶇О": "",
"瑙勬牸鍨嬪彿": "",
+ "HPRocID": "0",
+ "宸ュ簭": "",
+ "HNowProcID": "0",
+ "褰撳墠宸ュ簭": "",
+ "HBadProcID": "0",
+ "璐ｄ换宸ュ簭": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
"HQty": "0",
- "HResult": "涓嶈壇",
+ "HResult": "鎶ュ簾",
"HEmpID": "0",
"妫�楠屽憳": "",
"HSourceID": "0",
"鐢熶骇璧勬簮": "",
"HBadReasonID": "0",
"涓嶈壇鍘熷洜": "",
+ "HBadPhenomenaID": "0",
+ "涓嶈壇鐜拌薄": "",
"HBarCode": "",
"HReportType": "3",
"HRemark": "",
@@ -481,6 +546,270 @@
}
});
}
+ //鐗╂枡
+ if (obj.event == 'HMaterNumberbtn') {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ obj.update({
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ })
+ $("#HMaterNumber" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].鐗╂枡浠ｇ爜)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (JSON.stringify(HDataTemp) != '{}') {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": HDataTemp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataTemp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataTemp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataTemp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataTemp.HUnitID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataTemp = {};
+ }
+ if (option.data[$(obj.tr).attr("data-index")].鐗╂枡浠ｇ爜 != '') {
+ $("#HMaterNumber" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(option.data[$(obj.tr).attr("data-index")].鐗╂枡浠ｇ爜);
+ return;
+ }
+ }
+ })
+ }
+ //褰撳墠宸ュ簭
+ if (obj.event == 'HNowProcNamebtn') {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "褰撳墠宸ュ簭鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HNowProcID": checkStatus.data[0].HItemID
+ , "褰撳墠宸ュ簭": checkStatus.data[0].宸ュ簭鍚嶇О
+ })
+ $("#HNowProcName" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].宸ュ簭鍚嶇О)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ }
+ })
+ }
+ //璐ｄ换宸ュ簭
+ if (obj.event == 'HBadProcNamebtn') {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璐ｄ换宸ュ簭鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HBadProcID": checkStatus.data[0].HItemID
+ , "璐ｄ换宸ュ簭": checkStatus.data[0].宸ュ簭鍚嶇О
+ })
+ $("#HBadProcName" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].宸ュ簭鍚嶇О)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ }
+ })
+ }
+ //妫�楠屽憳
+ if (obj.event == 'HEmpNamebtn') {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "妫�楠屽憳鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager&openType=2', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "妫�楠屽憳": checkStatus.data[0].鑱屽憳鍚嶇О
+ , "HEmpID": checkStatus.data[0].HItemID
+ })
+ $("#HEmpName" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].鑱屽憳鍚嶇О)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (JSON.stringify(HDataTemp) != '{}') {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HEmpID": HDataTemp.HItemID
+ , "妫�楠屽憳": HDataTemp.鑱屽憳鍚嶇О
+ })
+ HDataTemp = {};
+ }
+ }
+ })
+ }
+ //鐢熶骇璧勬簮
+ if (obj.event == 'HSourceNamebtn') {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "鐢熶骇璧勬簮": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+ , "HSourceID": checkStatus.data[0].HItemID
+ })
+ $("#HSourceName" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (JSON.stringify(HDataTemp) != '{}') {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HSourceID": HDataTemp.HItemID
+ , "鐢熶骇璧勬簮": HDataTemp.鐢熶骇璧勬簮鍚嶇О
+ })
+ HDataTemp = {};
+ }
+ }
+ })
+ }
+ //涓嶈壇鍘熷洜
+ if (obj.event == 'HBadReasonbtn') {
+ var HProcName = obj.data.宸ュ簭;
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "涓嶈壇鍘熷洜鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html?Type=BadReason&HProcName=' + HProcName + '&openType=2', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "涓嶈壇鍘熷洜": checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О
+ , "HBadReasonID": checkStatus.data[0].HItemID
+ })
+ $("#HBadReason" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (JSON.stringify(HDataTemp) != '{}') {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HBadReasonID": HDataTemp.HItemID
+ , "涓嶈壇鍘熷洜": HDataTemp.涓嶈壇鍘熷洜鍚嶇О
+ })
+ HDataTemp = {};
+ }
+ }
+ })
+ }
+ //涓嶈壇鐜拌薄
+ if (obj.event == 'HBadPhenomenabtn') {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "涓嶈壇鐜拌薄" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_BadPhenomena.html?openType=2', "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ obj.update({
+ "HBadPhenomenaID": checkStatus.data[0].HItemID
+ , "涓嶈壇鐜拌薄": checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О
+ })
+ $("#HBadPhenomena" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
});
//#endregion
@@ -536,6 +865,7 @@
});
});
//#endregion
+
//#endregion
//#endregion
@@ -583,7 +913,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- if (OperationType == 1 || OperationType == 4) {
+ if (OperationType == 1 || OperationType == 4 || OperationType == 3) {
HOrgIDBar = sessionStorage["OrganizationID"];
}
$("#HOrgID").val(HOrgIDBar);
@@ -622,27 +952,35 @@
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', width: 100, style: "background-color:#efefef4d;" }
, { field: 'HMaterID', title: 'HMaterID', width: 100, style: "background-color:#efefef4d;", hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, event: "HMaterID", edit: 'text' }//f7
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, event: "HMaterID", edit: 'text', templet: '#HMaterNumberbtn' }//f7
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: "background-color:#efefef4d;" }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: "background-color:#efefef4d;" }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, style: "background-color:#efefef4d;" }
+ , { field: 'HProcID', title: 'HProcID', width: 100, style: "background-color:#efefef4d;", hide: true }
+ , { field: '宸ュ簭', title: '宸ュ簭', width: 150 }
+ , { field: 'HNowProcID', title: 'HNowProcID', width: 100, style: "background-color:#efefef4d;", hide: true }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 150, event: "HNowProcID", edit: 'text', templet: '#HNowProcNamebtn' }
+ , { field: 'HBadProcID', title: 'HBadProcID', width: 100, style: "background-color:#efefef4d;", hide: true }
+ , { field: '璐ｄ换宸ュ簭', title: '璐ｄ换宸ュ簭', width: 150, event: "HBadProcID", edit: 'text', templet: '#HBadProcNamebtn' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, style: "background-color:#efefef4d;", hide: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: "background-color:#efefef4d;" }//f7
, { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text' }
, { field: 'HResult', title: '鍒ゅ畾缁撴灉', width: 100, templet: '#HResult' }
, { field: 'HEmpID', title: 'HEmpID', width: 100, style: "background-color:#efefef4d;", hide: true }
- , { field: '妫�楠屽憳', title: '妫�楠屽憳', width: 150, event: "HEmp", edit: 'text' }
+ , { field: '妫�楠屽憳', title: '妫�楠屽憳', width: 150, event: "HEmp", edit: 'text', templet: '#HEmpNamebtn' }
, { field: 'HSourceID', title: 'HSourceID', width: 100, style: "background-color:#efefef4d;", hide: true }
- , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, event: "HSource", edit: 'text' }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, event: "HSource", edit: 'text', templet: '#HSourceNamebtn' }
, { field: 'HBadReasonID', title: 'HBadReasonID', width: 100, style: "background-color:#efefef4d;", hide: true }
- , { field: '涓嶈壇鍘熷洜', title: '涓嶈壇鍘熷洜', width: 150, event: "HBadReason", edit: 'text' }
+ , { field: '涓嶈壇鍘熷洜', title: '涓嶈壇鍘熷洜', width: 150, event: "HBadReason", edit: 'text', templet: '#HBadReasonbtn' }
+ , { field: 'HBadPhenomenaID', title: 'HBadPhenomenaID', width: 100, style: "background-color:#efefef4d;", hide: true }
+ , { field: '涓嶈壇鐜拌薄', title: '涓嶈壇鐜拌薄', width: 150, event: "HBadPhenomena", edit: 'text', templet: '#HBadPhenomenabtn' }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓诲唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 160, style: 'background-color: #f9f9f9;' } //f7
, { field: 'HProcExchInterID', title: '宸ュ簭娴佽浆鍗″唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
, { field: 'HProcExchEntryID', title: '宸ュ簭娴佽浆鍗″瓙鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' } //f7
- , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', width: 160, style: 'background-color: #f9f9f9;' } //f7
, { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' } //f7
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' } //f7
@@ -680,16 +1018,24 @@
"鐗╂枡浠ｇ爜": "",
"鐗╂枡鍚嶇О": "",
"瑙勬牸鍨嬪彿": "",
+ "HPRocID": "0",
+ "宸ュ簭": "",
+ "HNowProcID": "0",
+ "褰撳墠宸ュ簭": "",
+ "HBadProcID": "0",
+ "璐ｄ换宸ュ簭": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
"HQty": "0",
- "HResult": "涓嶈壇",
+ "HResult": "鎶ュ簾",
"HEmpID": "0",
"妫�楠屽憳": "",
"HSourceID": "0",
"鐢熶骇璧勬簮": "",
"HBadReasonID": "0",
"涓嶈壇鍘熷洜": "",
+ "HBadPhenomenaID": "0",
+ "涓嶈壇鐜拌薄": "",
"HBarCode": "",
"HReportType": "3",
"HRemark": "",
@@ -791,6 +1137,12 @@
"HUnitID": data.HUnitID,
"璁￠噺鍗曚綅": data.璁￠噺鍗曚綅,
"HQty": data.鏁伴噺,
+ "HProcID": data.HProcID,
+ "宸ュ簭": data.宸ュ簭鍚嶇О,
+ "HNowProcID": data.HNowProcID,
+ "褰撳墠宸ュ簭": data.褰撳墠宸ュ簭,
+ "HBadProcID": data.HBadProcID,
+ "璐ｄ换宸ュ簭": data.璐ｄ换宸ュ簭,
"HResult": data.鍒ゅ畾缁撴灉,
"HEmpID": data.HEmpID,
"妫�楠屽憳": data.妫�楠屽憳,
@@ -798,6 +1150,8 @@
"鐢熶骇璧勬簮": data.鐢熶骇璧勬簮,
"HBadReasonID": data.HBadReasonID,
"涓嶈壇鍘熷洜": data.涓嶈壇鍘熷洜,
+ "HBadPhenomenaID": data.HBadPhenomenaID,
+ "涓嶈壇鐜拌薄": data.涓嶈壇鐜拌薄,
"HBarCode": data.HBarCode,
"HReportType": data.HReportType,
"HRemark": data.澶囨敞,
@@ -823,6 +1177,17 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈Result鍊艰缃笅鎷夊垪琛�
setSelectHResultByTableRender();
+
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HMaterNumber' + i + '').val(option.data[i - 1].鐗╂枡浠ｇ爜);
+ $('#HNowProcName' + i + '').val(option.data[i - 1].褰撳墠宸ュ簭);
+ $('#HBadProcName' + i + '').val(option.data[i - 1].璐ｄ换宸ュ簭);
+ $('#HEmpName' + i + '').val(option.data[i - 1].妫�楠屽憳);
+ $('#HSourceName' + i + '').val(option.data[i - 1].鐢熶骇璧勬簮);
+ $('#HBadReason' + i + '').val(option.data[i - 1].涓嶈壇鍘熷洜);
+ $('#HBadPhenomena' + i + '').val(option.data[i - 1].涓嶈壇鐜拌薄);
+ }
+ form.render('select');
layer.close(ajaxLoad);
} else {
@@ -903,11 +1268,207 @@
"HSourceBillNo": result.data[i]["鍗曟嵁鍙�"],
"HSourceBillType": result.data[i]["鍗曟嵁绫诲瀷"],
- "HResult": "涓嶈壇",
+ "HResult": "鎶ュ簾",
+ "HEmpID": "0",
+ "妫�楠屽憳": "",
+ "HPRocID": "0",
+ "宸ュ簭": "",
+ "HNowProcID": "0",
+ "褰撳墠宸ュ簭": "",
+ "HBadProcID": "0",
+ "璐ｄ换宸ュ簭": "",
+ "HBadReasonID": "0",
+ "涓嶈壇鍘熷洜": "",
+ "HBadPhenomenaID": "0",
+ "涓嶈壇鐜拌薄": "",
+ "HBarCode": "",
+ "HReportType": "3",
+ "HAddr": "",
+ "HMaker": "",
+ "HMakeDate": Format(new Date(), 'yyyy-MM-dd')
+ }
+ );
+ }
+ option.data = rowdata;
+
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region (宸ュ簭娴佽浆鍗�)涓嬫帹椤甸潰鍒濆鍖�
+ function set_ProcessBill(linterid, HEntryID) {
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+
+ //鐩稿叧鏂囨湰妗嗕俊鎭垵濮嬪寲
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/MES_IF_ProcessBillList_Json",
+ type: "GET",
+ async: false,
+ data: { "hinterid": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+ success: function (d) {
+ var result = d;
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = data.HPRDORGID;
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": result.data[i]["HMaterID"],
+ "鐗╂枡浠ｇ爜": result.data[i]["浜у搧浠ｇ爜"],
+ "鐗╂枡鍚嶇О": result.data[i]["浜у搧鍚嶇О"],
+ "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
+ "HProcID": result.data[i]["HProcID"],
+ "宸ュ簭": result.data[i]["宸ュ簭鍚嶇О"],
+ "HUnitID": result.data[i]["HUnitID"],
+ "璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
+ "HQty": result.data[i]["鐢熶骇浠诲姟鍗曟暟閲�"],
+ "HSourceID": "0",
+ "鐢熶骇璧勬簮": "",
+ "HNowProcID": "0",
+ "褰撳墠宸ュ簭": "",
+ "HBadProcID": "0",
+ "璐ｄ换宸ュ簭": "",
+
+ "HRemark": "",
+ "HProcExchInterID": "0",
+ "HProcExchEntryID": "0",
+ "HProcExchBillNo": "",
+ "HICMOInterID": result.data[i]["hicmointerid"],
+ "HICMOEntryID": result.data[i]["HICMOEntryID"],
+ "HICMOBillNo": result.data[i]["浠诲姟鍗曞彿"],
+
+ "HProcExchInterID": result.data[i]["hmainid"],
+ "HProcExchEntryID": result.data[i]["HEntryID"],
+ "HProcExchBillNo": result.data[i]["鍗曟嵁鍙�"],
+
+
+ "HSourceInterID": result.data[i]["hmainid"],
+ "HSourceEntryID": result.data[i]["HEntryID"],
+ "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"],
+ "HSourceBillType": result.data[i]["鍗曟嵁绫诲瀷"],
+
+ "HResult": "鎶ュ簾",
"HEmpID": "0",
"妫�楠屽憳": "",
"HBadReasonID": "0",
"涓嶈壇鍘熷洜": "",
+ "HBadPhenomenaID": "0",
+ "涓嶈壇鐜拌薄": "",
+ "HBarCode": "",
+ "HReportType": "3",
+ "HAddr": "",
+ "HMaker": "",
+ "HMakeDate": Format(new Date(), 'yyyy-MM-dd')
+ }
+ );
+ }
+ option.data = rowdata;
+
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region (鍑虹珯姹囨姤鍗�)涓嬫帹椤甸潰鍒濆鍖�
+ function set_StationOutBill(linterid) {
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+
+ //鐩稿叧鏂囨湰妗嗕俊鎭垵濮嬪寲
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationOutBill/PushDownBackInfo",
+ type: "GET",
+ async: false,
+ data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ //涓昏〃璧嬪��
+ $("#HEmpID").val(sessionStorage["HEmpID"] == undefined ? 0 : sessionStorage["HEmpID"]);
+ $("#HEmpName").val(sessionStorage["HEmpName"]);
+ $("#HDeptID").val(data.HDeptID);
+ $("#HDeptName").val(data.杞﹂棿);
+ $("#HGroupID").val(data.HGroupID);
+ $("#HGroupName").val(data.鐢熶骇鐝粍);
+
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = data.缁勭粐;
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": result.data[i]["HMaterID"],
+ "鐗╂枡浠ｇ爜": result.data[i]["浜у搧浠ｇ爜"],
+ "鐗╂枡鍚嶇О": result.data[i]["浜у搧鍚嶇О"],
+ "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
+ "HProcID": result.data[i]["HProcID"],
+ "宸ュ簭": result.data[i]["宸ュ簭"],
+ "HUnitID": result.data[i]["HUnitID"],
+ "璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
+ "HQty": 1,
+ "HSourceID": result.data[i]["HSourceID"],
+ "鐢熶骇璧勬簮": result.data[i]["鐢熶骇璧勬簮"],
+ "HNowProcID": "0",
+ "褰撳墠宸ュ簭": "",
+ "HBadProcID": "0",
+ "璐ｄ换宸ュ簭": "",
+ "HRemark": "",
+ "HProcExchInterID": result.data[i]["HProcExchInterID"],
+ "HProcExchEntryID": result.data[i]["HProcExchEntryID"],
+ "HProcExchBillNo": result.data[i]["宸ュ簭娴佽浆鍗″彿"],
+ "HICMOInterID": result.data[i]["HICMOInterID"],
+ "HICMOEntryID": result.data[i]["HICMOEntryID"],
+ "HICMOBillNo": result.data[i]["鐢熶骇璁㈠崟鍙�"],
+ "HSourceInterID": result.data[i]["hmainid"],
+ "HSourceEntryID": "0",
+ "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"],
+ "HSourceBillType": result.data[i]["鍗曟嵁绫诲瀷"],
+ "HResult": "",
+ "HEmpID": "0",
+ "妫�楠屽憳": "",
+ "HBadReasonID": "0",
+ "涓嶈壇鍘熷洜": "",
+ "HBadPhenomenaID": "0",
+ "涓嶈壇鐜拌薄": "",
"HBarCode": "",
"HReportType": "3",
"HAddr": "",
@@ -941,7 +1502,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -949,7 +1510,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -966,7 +1527,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐧昏浜哄垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -974,7 +1535,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(checkStatus.data[0].HItemID);
getEmpInfoByHEmpID(checkStatus.data[0].HItemID);
@@ -991,9 +1552,9 @@
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '鐧昏浜哄垪琛�'//鏍囬
+ , title: '鐝粍鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
+ , content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup&openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1016,10 +1577,11 @@
function set_SaveBill(data) {
//璁板綍鎿嶄綔绫诲瀷
var refSav = "";
- if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+ if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5 || OperationType == 6) {
refSav = "Add";
data.field.HChangeDate = new Date();
data.field.HSTOCKORGID = data.field.HOrgID;
+ data.field.HBillSubType = HBillSubType == '3717-1' ? HBillSubType : '3717';
}
if (OperationType == 3) {
refSav = "Update";
@@ -1034,9 +1596,23 @@
$("#HUpDater").val(sessionStorage["HUserName"]);
$("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
}
+ //绛涢�夊垹闄や箣鍚庝笉涓虹┖鐨勬暟鎹粍
+ var row = [];
+ for (var i = 0; i < table.cache['mainTable'].length; i++) {
+ if (table.cache['mainTable'][i] != "") {
+ if (table.cache["mainTable"][i].鐗╂枡鍚嶇О.indexOf("\"") != -1 || table.cache["mainTable"][i].鐗╂枡鍚嶇О.indexOf(";") != -1) {
+ table.cache["mainTable"][i].鐗╂枡鍚嶇О = table.cache["mainTable"][i].鐗╂枡鍚嶇О.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ if (table.cache["mainTable"][i].瑙勬牸鍨嬪彿.indexOf("\"") != -1 || table.cache["mainTable"][i].瑙勬牸鍨嬪彿.indexOf(";") != -1) {
+ table.cache["mainTable"][i].瑙勬牸鍨嬪彿 = table.cache["mainTable"][i].瑙勬牸鍨嬪彿.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+
+ row.push(table.cache['mainTable'][i])
+ }
+ }
//搴忓垪鍖栬〃澶翠俊鎭拰瀛愯〃淇℃伅
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(option.data);
+ var sSubStr = JSON.stringify(row);
//鎷兼帴鍙傛暟
var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
@@ -1083,26 +1659,47 @@
return false;
}
- if ($("#HDeptID").val() == "0") {
- layer.msg("鐢熶骇杞﹂棿鏈�夋嫨!");
- return false;
- }
+ //if ($("#HDeptID").val() == "0") {
+ // layer.msg("鐢熶骇杞﹂棿鏈�夋嫨!");
+ // return false;
+ //}
- if ($("#HEmpID").val() == "0") {
+ if ($("#HEmpID").val() == "0" || $("#HEmpID").val() == undefined || $("#HEmpID").val() == null || $("#HEmpName").val() == "") {
layer.msg("鐧昏浜烘湭閫夋嫨!");
return false;
}
//#endregion
//#region 瀛愯〃 鏁版嵁妫�楠�
+ if (option.data.length == 0) {
+ layer.msg("鐢熶骇璐ㄩ噺姹囨姤鍗曞瓙琛ㄤ腑鏈瓨鍦ㄨ褰�!");
+ return false;
+ }
+
for (var i = 0; i < option.data.length; i++) {
//鏁伴噺鏍煎紡鏍￠獙
temp = option.data[i]["HQty"] + "";
if (temp == "0") {
- layer.msg("绗�" + (i+1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+ layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
return false;
} else if (!ref.test(temp)) {
- layer.msg("绗�" + (i+1) + "琛岋細鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ if (option.data[i]["HMaterID"] == 0 || option.data[i]["HMaterID"] == undefined || option.data[i]["HMaterID"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡淇℃伅涓嶅厑璁镐负绌猴紒");
+ return false;
+ }
+ if (option.data[i]["HProcID"] == 0 || option.data[i]["HProcID"] == undefined || option.data[i]["HProcID"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細宸ュ簭淇℃伅涓嶅厑璁镐负绌猴紒");
+ return false;
+ }
+ if (option.data[i]["HResult"] == 0 || option.data[i]["HResult"] == undefined || option.data[i]["HResult"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細鍒ゅ畾缁撴灉涓嶅厑璁镐负绌猴紒");
+ return false;
+ }
+ if (option.data[i]["HBadReasonID"] == 0 || option.data[i]["HBadReasonID"] == undefined || option.data[i]["HBadReasonID"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細涓嶈壇鍘熷洜涓嶅厑璁镐负绌猴紒");
return false;
}
}
@@ -1170,8 +1767,20 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈Result鍊艰缃笅鎷夊垪琛�
setSelectHResultByTableRender();
+
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HMaterNumber' + i + '').val(option.data[i - 1].HBadReasonNumber);
+ $('#HNowProcName' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ $('#HBadProcName' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ $('#HEmpName' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ $('#HSourceName' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ $('#HBadReason' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ $('#HBadPhenomena' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ }
+ form.render('select');
}
}
//#endregion
@@ -1274,6 +1883,8 @@
if (event.key == "F7") {
//鐗╂枡
if (obj.event == "HMaterID") {
+ var HOrgID = $("#HOrgID").val();
+
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1282,7 +1893,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1296,13 +1907,27 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HMaterID": checkStatus.data[0].HItemID
- , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
, "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (JSON.stringify(HDataTemp) != '{}') {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": HDataTemp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataTemp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataTemp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataTemp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataTemp.HUnitID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -1316,7 +1941,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../../Baseset/鍩虹璧勬枡/Gy_UnitList.html?Type=&openType=2', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1328,10 +1953,20 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "璁￠噺鍗曚綅": checkStatus.data[0].HName
+ "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
, "HUnitID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (JSON.stringify(HDataTemp) != '{}') {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": HDataTemp.HItemID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -1345,7 +1980,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager&openType=2', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1362,6 +1997,16 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
+ , end: function () {
+ if (JSON.stringify(HDataTemp) != '{}') {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HEmpID": HDataTemp.HItemID
+ , "妫�楠屽憳": HDataTemp.鑱屽憳鍚嶇О
+ })
+ HDataTemp = {};
+ }
+ }
})
}
//鐢熶骇璧勬簮
@@ -1374,7 +2019,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1391,10 +2036,21 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
+ , end: function () {
+ if (JSON.stringify(HDataTemp) != '{}') {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HSourceID": HDataTemp.HItemID
+ , "鐢熶骇璧勬簮": HDataTemp.鐢熶骇璧勬簮鍚嶇О
+ })
+ HDataTemp = {};
+ }
+ }
})
}
//涓嶈壇鍘熷洜
if (obj.event == "HBadReason") {
+ var HProcName = obj.data.宸ュ簭;
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1403,7 +2059,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html', 'yes']
+ , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html?Type=BadReason&HProcName=' + HProcName + '&openType=2', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1420,9 +2076,108 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
+ , end: function () {
+ if (JSON.stringify(HDataTemp) != '{}') {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HBadReasonID": HDataTemp.HItemID
+ , "涓嶈壇鍘熷洜": HDataTemp.涓嶈壇鍘熷洜鍚嶇О
+ })
+ HDataTemp = {};
+ }
+ }
})
}
+ if (obj.event == "HBadPhenomena") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "涓嶈壇鐜拌薄" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_BadPhenomena.html?openType=2', "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ obj.update({
+ "HBadPhenomenaID": checkStatus.data[0].HItemID
+ , "涓嶈壇鐜拌薄": checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //璐ｄ换宸ュ簭鍒楄〃
+ if (obj.event == "HBadProcID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璐ｄ换宸ュ簭鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HBadProcID": checkStatus.data[0].HItemID
+ , "璐ｄ换宸ュ簭": checkStatus.data[0].宸ュ簭鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ }
+ })
+ }
+ //褰撳墠宸ュ簭鍒楄〃
+ if (obj.event == "HNowProcID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "褰撳墠宸ュ簭鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HNowProcID": checkStatus.data[0].HItemID
+ , "褰撳墠宸ュ簭": checkStatus.data[0].宸ュ簭鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ }
+ })
+ }
obj.event = "";
return false;
}
@@ -1542,11 +2297,31 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈Result鍊艰缃笅鎷夊垪琛�
setSelectHResultByTableRender();
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HMaterNumber' + i + '').val(option.data[i - 1].鐗╂枡浠ｇ爜);
+ $('#HNowProcName' + i + '').val(option.data[i - 1].褰撳墠宸ュ簭);
+ $('#HBadProcName' + i + '').val(option.data[i - 1].璐ｄ换宸ュ簭);
+ $('#HEmpName' + i + '').val(option.data[i - 1].妫�楠屽憳);
+ $('#HSourceName' + i + '').val(option.data[i - 1].鐢熶骇璧勬簮);
+ $('#HBadReason' + i + '').val(option.data[i - 1].涓嶈壇鍘熷洜);
+ $('#HBadPhenomena' + i + '').val(option.data[i - 1].涓嶈壇鐜拌薄);
+ }
+ form.render('select');
} else {
table.render(option);
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈Result鍊艰缃笅鎷夊垪琛�
setSelectHResultByTableRender();
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HMaterNumber' + i + '').val(option.data[i - 1].鐗╂枡浠ｇ爜);
+ $('#HNowProcName' + i + '').val(option.data[i - 1].褰撳墠宸ュ簭);
+ $('#HBadProcName' + i + '').val(option.data[i - 1].璐ｄ换宸ュ簭);
+ $('#HEmpName' + i + '').val(option.data[i - 1].妫�楠屽憳);
+ $('#HSourceName' + i + '').val(option.data[i - 1].鐢熶骇璧勬簮);
+ $('#HBadReason' + i + '').val(option.data[i - 1].涓嶈壇鍘熷洜);
+ $('#HBadPhenomena' + i + '').val(option.data[i - 1].涓嶈壇鐜拌薄);
+ }
+ form.render('select');
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1626,7 +2401,7 @@
// 鍩虹璧勬枡杩斿洖鏁版嵁
function GetHEmpValue(obj) //杩斿洖閿�鍞憳
{
- $("#HEmpName").val(obj[0].HName);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(obj[0].HItemID);
getEmpInfoByHEmpID(obj[0].HItemID);
@@ -1634,8 +2409,39 @@
function GetHDeptNameValue(obj) //杩斿洖閿�鍞儴闂�
{
- $("#HDeptName").val(obj[0].HName);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
+ }
+
+ function GetHGroupValue(obj) //杩斿洖鐝粍
+ {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+
+ function GetMaterValue(obj) //鐗╂枡鍚嶇О
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetUnitValue(obj) //璁￠噺鍗曚綅
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetHSecManagerValue(obj) //杩斿洖妫�楠屽憳
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetGySource(obj) //杩斿洖鐢熶骇璧勬簮
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetBadReasonaValue(obj) //杩斿洖涓嶈壇鍘熷洜
+ {
+ HDataTemp = obj[0];
}
//#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
@@ -1697,7 +2503,7 @@
}
});
}
- //#endregion
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1