From 7f7179d00825d06ec064f8bbbccdf406424a4609 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 12 四月 2024 17:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 618 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 366 insertions(+), 252 deletions(-)
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index d90b2ee..ab6a03c 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -54,8 +54,8 @@
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 2px; ">
<!--<button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSearch" >棰勮</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>-->
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
@@ -137,88 +137,85 @@
<input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="鏄惁榛樿宸ヨ壓">
<input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
<!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="鏄惁鍚敤" lay-skin="primary" lay-filter="checkboxHUseFlag">
- <input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
+ <input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
</div>
</div>
</div>
<div class="layui-row">
+ <div class="layui-inline" id="HIDDEN" style="display:none;">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" 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>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
-
-
-
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" 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>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<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="HMainWorkQty" lay-verify="HMainWorkQty" id="HMainWorkQty" value="0" onmouseover="this.title=this.value">
- </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="HMainUnitTime" lay-verify="HMainUnitTime" id="HMainUnitTime" value="0">-->
+ <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="HMainWorkQty" lay-verify="HMainWorkQty" id="HMainWorkQty" value="0" onmouseover="this.title=this.value">
+ </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="HMainUnitTime" lay-verify="HMainUnitTime" id="HMainUnitTime" value="0">-->
<!--<input type="hidden" value="灏忔椂" name="HMainTimeUnit" id="HMainTimeUnit">-->
<!--</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="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
- </div>
- </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="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<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="HStdSourceQty" id="HStdSourceQty" lay-verify="HStdSourceQty" value="0">-->
+ <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="HStdSourceQty" id="HStdSourceQty" lay-verify="HStdSourceQty" value="0">-->
<!--style="background-color:#efefef4d;"-->
<!--</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="HAddSourceRate" id="HAddSourceRate" lay-verify="HAddSourceRate" value="0">-->
+ </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="HAddSourceRate" id="HAddSourceRate" lay-verify="HAddSourceRate" value="0">-->
<!--style="background-color:#efefef4d;"-->
<!--</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" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0">-->
+ </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" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0">-->
<!--style="background-color:#efefef4d;"-->
<!--</div>
- </div>-->
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -228,7 +225,7 @@
<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
</div>
</div>
-
+
</div>
@@ -430,10 +427,17 @@
</div>
</script>
+ <!--澶嶉�夋 鎺掍骇宸ュ簭鏍囪-->
+ <script type="text/html" id="HSortProcFlag">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HSortProcFlag" lay-filter="HSortProcFlag" id="HSortProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+
<!--澶嶉�夋 涓嬮亾娴佽浆宸ュ簭-->
<script type="text/html" id="HNextProcFlag">
<div class="layui-input-block" style="margin-left: 20px;">
- <input type="checkbox" name="HNextProcFlag" disabled="disabled" lay-filter="HNextProcFlag" id="HNextProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ <input type="checkbox" name="HNextProcFlag" disabled="disabled" lay-filter="HNextProcFlag" id="HNextProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
</div>
</script>
@@ -459,7 +463,7 @@
</script>
<script>
-
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -485,14 +489,17 @@
, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": ""
, "HProcID": 0, "宸ヤ綔涓績浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績": "", "HSupID": 0
- , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
+ , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
, "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
, "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
, "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
- , "HWHID": 0, "HWHName": "","HRemark":""
+ , "HWHID": 0, "HWHName": "", "HRemark": "", "HWorkTimes_S": 0
+ , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
+ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
+ , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
}];
var HModName = "Gy_RoutingBill";
//#endregion
@@ -503,13 +510,14 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , totalRow: true
//, cellMinWidth: 120
, height: 400
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
- // , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
+ // , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
, { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "CheckHCenterID" }//涓嶅～
// , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
@@ -520,6 +528,7 @@
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }//f7
, { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
+ , { field: 'HSortProcFlag', title: '鎺掍骇宸ュ簭鏍囪', templet: "#HSortProcFlag" }//checkbox
//, { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
////, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
@@ -532,7 +541,18 @@
//, { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
//, { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
//, { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
- , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text' }//榛樿
+ , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text', totalRow: true }//榛樿
+
+ //, { field: 'HQCSchemeID_Fst', title: '棣栦欢妫�楠屾柟妗圛D', hide: true }//f7
+ //, { field: 'HQCSchemeNumber_Fst', title: '棣栦欢妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Fst",width:125 }
+ //, { field: 'HQCSchemeName_Fst', title: '棣栦欢妫�楠屾柟妗堝悕绉�', width: 125 }//f7
+ //, { field: 'HQCSchemeID_Proc', title: '杞簭妫�楠屾柟妗圛D', hide: true }//f7
+ //, { field: 'HQCSchemeNumber_Proc', title: '杞簭妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Proc", width: 125}
+ //, { field: 'HQCSchemeName_Proc', title: '杞簭妫�楠屾柟妗堝悕绉�', width: 125}//f7
+ //, { field: 'HQCSchemeID_Patrol', title: '宸℃妫�楠屾柟妗圛D', hide: true }//f7
+ //, { field: 'HQCSchemeNumber_Patrol', title: '宸℃妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
+ //, { field: 'HQCSchemeName_Patrol', title: '宸℃妫�楠屾柟妗堝悕绉�', width: 125}//f7
+
//, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
//, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
////, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
@@ -567,6 +587,7 @@
//, { field: 'HAutoTrunFlag', title: '鑷姩绉昏浆', templet: "#HAutoTrunFlag" }//chenbox
//, { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text' }
//, { field: 'HProcWorkNum', title: '绋嬪簭鍙�', edit: 'text' }
+ //, { field: 'HWorkTimes_S', title: '浜у搧鍗曚欢宸ユ椂', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
//, done: function (res, curr, count) {
@@ -609,15 +630,47 @@
//}
var params = getUrlVars();
- var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ var HBillSubType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
//var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+ var IsHavingPermissions = 0; //鎺掍骇椤甸潰璺宠浆杩囨潵鏃跺垽鏂敤鎴锋槸鍚︽湁宸ヨ壓璺嚎缂栬緫鏉冮檺,0浠ｇ爜娌℃湁鏉冮檺锛�1浠ｈ〃鏈夋潈闄�
+ //鎺掍骇椤甸潰璺宠浆缂栬緫鏌ョ湅宸ヨ壓璺嚎
+ if (HBillSubType == 4610 && OperationType == 3) {
+ HBillSubType = 3301
+ IsHavingPermissions = params[params[3]];
+ if (IsHavingPermissions == 0) {
+ //娌℃湁宸ヨ壓璺嚎鐨勭紪杈戞潈闄愶紝绂佺敤鎸夐挳
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CloseBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CancelCloseBill').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ }
+ //鎺掍骇椤甸潰璺宠浆鏂板宸ヨ壓璺嚎
+ if (HBillSubType == 4610 && OperationType == 1) {
+ HBillSubType = 3301
+
+ $("#HMaterID").val(params[params[3]]);//鐗╂枡ID
+
+ $("#HMaterNumber").val(getParams("HMaterNumber"));//鐗╂枡浠ｇ爜
+ $("#HMaterName").val(getParams("HMaterName"));//鐗╂枡鍚嶇О
+ $("#HMaterModel").val(getParams("HMaterModel") == "" ? " " : getParams("HMaterModel"));//瑙勬牸鍨嬪彿
+ }
+
+ if (HBillSubType == "SUB") {
+ //鏄剧ず宸ュ簭
+ $("#HIDDEN").show();
+ } else {
+ HBillSubType = "3301";
+ }
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- //linteridSub = -1;
+ //$("#HIDDEN").hide();
OperationType = 1;
+
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
@@ -647,6 +700,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+
//绂佺敤缁勭粐閫夐」
$("#HOrgID").attr("disabled", true);
RoadBillMain(linterid);
@@ -741,6 +795,18 @@
});
});
+ //鎺掍骇宸ュ簭鏍囪
+ form.on('checkbox(HSortProcFlag)', 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.HSortProcFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
//涓嬮亾娴佽浆宸ュ簭
form.on('checkbox(HNextProcFlag)', function (data) {
//鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
@@ -814,14 +880,17 @@
, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": ""
, "HProcID": 0, "宸ヤ綔涓績浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績": "", "HSupID": 0
- , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
+ , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
, "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
, "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
, "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
- , "HWHID": 0, "HWHName": "", "HRemark": ""
+ , "HWHID": 0, "HWHName": "", "HRemark": "", "HWorkTimes_S": 0
+ , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
+ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
+ , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
};
switch (obj.event) {
case 'btn-AddLine':
@@ -834,6 +903,10 @@
//濮斿鍗忓姪
if (option.data[i - 1].HSupFlag) {
$('#HSupFlag' + i + '').attr("checked", true);
+ }
+ //鎺掍骇宸ュ簭鏍囪
+ if (option.data[i - 1].HSortProcFlag) {
+ $('#HSortProcFlag' + i + '').attr("checked", true);
}
//涓嬮亾娴佽浆宸ュ簭
if (option.data[i - 1].HNextProcFlag) {
@@ -875,6 +948,10 @@
if (option.data[i - 1].HSupFlag) {
$('#HSupFlag' + i + '').attr("checked", true);
}
+ //鎺掍骇宸ュ簭鏍囪
+ if (option.data[i - 1].HSortProcFlag) {
+ $('#HSortProcFlag' + i + '').attr("checked", true);
+ }
//涓嬮亾娴佽浆宸ュ簭
if (option.data[i - 1].HNextProcFlag) {
$('#HNextProcFlag' + i + '').attr("checked", true);
@@ -899,19 +976,19 @@
//鍒楄缃�
case 'set_HideColumn':
get_HideColumn();
- break;
+ break;
//涓婁竴琛�
case 'btn_up':
btn_up(data);
- break;
+ break;
//涓嬩竴琛�
case 'btn_under':
btn_under(data);
- break;
+ break;
//鍒锋柊娴佹按鍙�
case 'btn_Refresh':
btn_Refresh(data);
- break;
+ break;
}
});
@@ -960,150 +1037,6 @@
}
});
- //閫夋嫨涓嶈壇鍘熷洜
- form.on('submit(HBadReasonID-BT)', function () {//閫夋嫨浠撳簱
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //閫夋嫨宸ュ簭璁″垝鍗�
- form.on('submit(HPlanID-BT)', function () {//閫夋嫨宸ュ簭璁″垝鍗�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '宸ュ簭璁″垝鍗曞垪琛�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessPlanViewList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //閫夋嫨璐ｄ换浜�
- form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //閫夋嫨鐢宠宸ュ簭
- form.on('submit(HSQProcID-BT)', function () {//閫夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //閫夋嫨璐ｄ换宸ュ簭
- form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //缂栬緫
- form.on('submit(cmdModify)', function () {//缂栬緫
- var sSubStr = table.cache['wl-table'];
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏄庣粏鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- // }
- });
-
- form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- })
-
-
- form.on('submit(Saver)', function (data) { //淇濆瓨
- //debugger;
- var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "SaveBadReasonList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- }
- else {
-
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- });
-
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -1147,13 +1080,15 @@
//浜у搧閫夋嫨椤甸潰
function get_checkSearchMater() {
+ var HOrgID = $("#HOrgID").val();
+
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鐗╂枡琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1163,13 +1098,13 @@
}
//鑾峰彇鏁版嵁
$("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
- $("#HMaterName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠ｇ爜
- $("#HMaterModel").val(checkStatus.data[0].HModel);//瑙勬牸鍨嬪彿
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
$("#HUnitID").val(checkStatus.data[0].HUnitID);//璁￠噺鍗曚綅id
- $("#HUnitName").val(checkStatus.data[0].HUnitName);//璁￠噺鍗曚綅鍚嶇О
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
if ($("#HName").val() == "") {
- $("#HName").val(checkStatus.data[0].HNumber);
+ $("#HName").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1212,7 +1147,7 @@
, area: ['90%', '90%']//澶у皬
, title: '璁￠噺鍗曚綅琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1222,7 +1157,7 @@
}
//鑾峰彇鏁版嵁
$("#HUnitID").val(checkStatus.data[0].HItemID);//璁￠噺鍗曚綅id
- $("#HUnitName").val(checkStatus.data[0].HName);//璁￠噺鍗曚綅鍚嶇О
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1290,7 +1225,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ヨ壓璺嚎澶х被鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_RoutingGroup.html', 'yes']
+ , content: ['../../璁″垝绠＄悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1299,8 +1234,8 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HRoutingGroupID").val(checkStatus.data[0].HItemID);//宸ヨ壓璺嚎澶х被id
- $("#HRoutingGroupIDName").val(checkStatus.data[0].HName);//宸ヨ壓璺嚎澶х被鍚嶇О
+ $("#HRoutingGroupID").val(checkStatus.data[0].id);//宸ヨ壓璺嚎澶х被id
+ $("#HRoutingGroupIDName").val(checkStatus.data[0].鍚嶇О);//宸ヨ壓璺嚎澶х被鍚嶇О
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1325,7 +1260,6 @@
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
- console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
@@ -1510,7 +1444,7 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length ==0) {
+ if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
@@ -1527,7 +1461,7 @@
NowNum = i + 1;
}
}
-
+
//鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
var WorkCente = [];
var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠ｇ爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
@@ -1572,14 +1506,17 @@
, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": WorkCente[j]["宸ュ簭鍚嶇О"]
, "HProcID": WorkCente[j]["HProcID"], "宸ヤ綔涓績浠ｇ爜": WorkCente[j]["宸ヤ綔涓績浠ｇ爜"], "HCenterID": WorkCente[j]["HCenterID"], "宸ヤ綔涓績": WorkCente[j]["宸ヤ綔涓績鍚嶇О"], "HSupID": 0
- , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
+ , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
, "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
, "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
, "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
- , "HWHID": 0, "HWHName": "", "HRemark": ""
+ , "HWHID": 0, "HWHName": "", "HRemark": "", "HWorkTimes_S": 0
+ , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
+ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
+ , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
})
j++;
}
@@ -1599,7 +1536,7 @@
//var HCenterID = 0;
//var HCenterNUmber = "";
//var HCenterName = "";
-
+
////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
//obj.update({
@@ -1612,6 +1549,19 @@
layer.close(index);//鍏抽棴寮圭獥
}
+ , end: function () {
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "宸ュ簭": OptionData[0].宸ュ簭鍚嶇О
+ , "HProcID": OptionData[0].HItemID
+ , "宸ヤ綔涓績": OptionData[0].宸ヤ綔涓績
+ , "HCenterID": OptionData[0].HWorkCenterID
+ , "宸ヤ綔涓績浠ｇ爜": OptionData[0].宸ヤ綔涓績浠ｇ爜
+ })
+ OptionData = [];
+ }
+ }
})
}
//宸ヤ綔涓績
@@ -1620,12 +1570,12 @@
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "浜哄憳鍒楄〃" //鏍囬
+ , title: "宸ヤ綔涓績鍒楄〃" //鏍囬
, closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1637,11 +1587,22 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "宸ヤ綔涓績": checkStatus.data[0].宸ヤ綔涓績
+ "宸ヤ綔涓績": checkStatus.data[0].宸ヤ綔涓績鍚嶇О
, "HCenterID": checkStatus.data[0].HItemID
, "宸ヤ綔涓績浠ｇ爜": checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "宸ヤ綔涓績": OptionData[0].宸ヤ綔涓績鍚嶇О
+ , "HCenterID": OptionData[0].HItemID
+ , "宸ヤ綔涓績浠ｇ爜": OptionData[0].宸ヤ綔涓績浠ｇ爜
+ })
+ OptionData = [];
+ }
}
})
}
@@ -1656,7 +1617,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?type=HSup", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1673,6 +1634,17 @@
, "渚涘簲鍟嗕唬鐮�": checkStatus.data[0].渚涘簲鍟嗕唬鐮�
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "渚涘簲鍟�": OptionData[0].渚涘簲鍟嗗悕绉�
+ , "HSupID": OptionData[0].HItemID
+ , "渚涘簲鍟嗕唬鐮�": OptionData[0].渚涘簲鍟嗕唬鐮�
+ })
+ OptionData = [];
+ }
}
})
}
@@ -1768,6 +1740,85 @@
}
})
}
+ //棣栦欢妫�楠屾柟妗�
+ if (obj.event == "HQCSchemeNumber_Fst") {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HQCSchemeID_Fst": checkStatus.data[0].HItemID
+ , "HQCSchemeNumber_Fst": checkStatus.data[0].妫�楠屾柟妗堜唬鐮�
+ , "HQCSchemeName_Fst": checkStatus.data[0].鏂规鍚嶇О
+ })
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //杞簭妫�楠屾柟妗�
+ if (obj.event == "HQCSchemeNumber_Proc") {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HQCSchemeID_Proc": checkStatus.data[0].HItemID
+ , "HQCSchemeNumber_Proc": checkStatus.data[0].妫�楠屾柟妗堜唬鐮�
+ , "HQCSchemeName_Proc": checkStatus.data[0].鏂规鍚嶇О
+ })
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //宸℃妫�楠屾柟妗�
+ if (obj.event == "HQCSchemeNumber_Patrol") {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HQCSchemeID_Patrol": checkStatus.data[0].HItemID
+ , "HQCSchemeNumber_Patrol": checkStatus.data[0].妫�楠屾柟妗堜唬鐮�
+ , "HQCSchemeName_Patrol": checkStatus.data[0].鏂规鍚嶇О
+ })
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
obj.event = "";
return false;
@@ -1784,7 +1835,7 @@
url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": HBillSubType },
success: function (d) {
//alert(JSON.stringify(d.data[0]))
@@ -1797,6 +1848,8 @@
else {
$("input[name='checkboxHStandard']").prop("checked", false);
}
+
+
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": OperationType == 2 ? "" : d.data[0].鍗曟嵁鍙�
@@ -1850,14 +1903,17 @@
, "HWorkQty_S": d.data[i].浜х嚎浜ц兘, "HSubStdEmpQty_S": d.data[i].浜х嚎浜烘暟, "HMouldNo": d.data[i].妯″叿缂栧彿, "HChangeMould": d.data[i].鎹㈡ā鏃堕棿, "HPackStd": d.data[i].鍛ㄨ浆绠辨爣鍑�
, "HPack": d.data[i].鍛ㄨ浆绠�, "HPutArea": d.data[i].鏆傛斁鍖�, "HMyWorkDays": d.data[i].鐢熶骇鍛ㄦ湡, "HMyFixWorkDays": d.data[i].鍥哄畾鐢熶骇澶╂暟, "宸ュ簭": d.data[i].宸ュ簭
, "HProcID": d.data[i].hprocid, "宸ヤ綔涓績浠ｇ爜": d.data[i].宸ヤ綔涓績浠ｇ爜, "HCenterID": d.data[i].HCenterID, "宸ヤ綔涓績": d.data[i].宸ヤ綔涓績鍚嶇О, "HSupID": d.data[i].HSupID
- , "渚涘簲鍟嗕唬鐮�": d.data[i].渚涘簲鍟嗕唬鐮�, "渚涘簲鍟�": d.data[i].渚涘簲鍟�, "HSupFlag": d.data[i].濮斿鏍囪 == 0 ? false : true, "HTimeUnit": d.data[i].鏃堕棿鍗曚綅, "HUnitTime": d.data[i].杩愯鏃堕棿
+ , "渚涘簲鍟嗕唬鐮�": d.data[i].渚涘簲鍟嗕唬鐮�, "渚涘簲鍟�": d.data[i].渚涘簲鍟�, "HSupFlag": d.data[i].濮斿鏍囪 == 0 ? false : true, "HSortProcFlag": d.data[i].鎺掍骇宸ュ簭鏍囪 == 0 ? false : true, "HTimeUnit": d.data[i].鏃堕棿鍗曚綅, "HUnitTime": d.data[i].杩愯鏃堕棿
, "HWorkQty": d.data[i].鍔犲伐鏁伴噺, "HPassRate": d.data[i].鑹巼, "HOverRate": d.data[i].瓒呴姣斾緥, "HReadyTime": d.data[i].鍑嗗鏃堕棿, "HQueueTime": d.data[i].鎺掗槦鏃堕棿
, "HMoveTime": d.data[i].杞Щ鏃堕棿, "HNextProcFlag": d.data[i].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[i].娴佽浆宸ュ簭 == 0 ? false : true, "HSubStdEmpQty": d.data[i].鏍囧噯浜烘暟, "HSubCanUseSourceQty": d.data[i].鍙搷浣滆澶囨暟
, "HFixPrice": d.data[i].鐝骇瀹氶, "HProcPrice": d.data[i].鍔犲伐鍗曚环, "HBadPrice": d.data[i].涓嶅悎鏍煎崟浠�, "HWasterPrice": d.data[i].鎶ュ簾鍗曚环, "HStdFlag": d.data[i].鏍囧噯瀹氶
, "HBeginDayQty": d.data[i].寮�宸ヤ綑閲忓ぉ鏁�, "HBeginFixQty": d.data[i].寮�宸ヤ綑閲忓浐鏁�, "HFixWorkDays": d.data[i].涓婇亾鍥哄畾澶╂暟, "HTrunWorkDays": d.data[i].涓婇亾寰幆鍛ㄦ湡, "HReadyTimes": d.data[i].鏈亾鍑嗗鏃堕棿
, "HICMOReadyTimes": d.data[i].鎹㈠崟鍑嗗鏃堕棿, "HAutoTrunFlag": d.data[i].鑷姩绉昏浆, "HTechnologyParameter": d.data[i].宸ヨ壓鍙傛暟, "HPicNum": d.data[i].鍥剧焊缂栧彿, "HProcCheckNote": d.data[i].鏈伐搴忕‘璁よ褰�
, "HProcWorkNum": d.data[i].绋嬪簭鍙�, "HBadWHID": d.data[i].HBadWHID, "HBadWHName": d.data[i].HBadWHName, "HWasterWHID": d.data[i].HWasterWHID, "HWasterWHName": d.data[i].HWasterWHName
- , "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ , "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName, "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HWorkTimes_S": d.data[i].浜у搧鍗曚欢宸ユ椂
+ , "HQCSchemeID_Fst": d.data[i].HQCSchemeID_Fst, "HQCSchemeNumber_Fst": d.data[i].棣栦欢妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Fst": d.data[i].棣栦欢妫�楠屾柟妗�
+ , "HQCSchemeID_Proc": d.data[i].HQCSchemeID_Proc, "HQCSchemeNumber_Proc": d.data[i].杞簭妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Proc": d.data[i].杞簭妫�楠屾柟妗�
+ , "HQCSchemeID_Patrol": d.data[i].HQCSchemeID_Patrol, "HQCSchemeNumber_Patrol": d.data[i].宸℃妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Patrol": d.data[i].宸℃妫�楠屾柟妗�
}
)
}
@@ -1867,6 +1923,9 @@
for (var i = 0; i < d.data.length; i++) {
if (d.data[i].濮斿鏍囪) {
$('#HSupFlag' + (i + 1)).attr("checked", true);
+ }
+ if (d.data[i].鎺掍骇宸ュ簭鏍囪) {
+ $('#HSortProcFlag' + (i + 1)).attr("checked", true);
}
if (d.data[i].HNextProcFlag) {
$('#HNextProcFlag' + (i + 1)).attr("checked", true);
@@ -1903,7 +1962,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
//var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + HBillSubType;
var index = layer.load();
$.ajax({
@@ -1976,6 +2035,7 @@
// layer.msg("鐢熶骇鐝粍娌℃湁閫夋嫨");
// return false;
//}
+ var pc = 0;
var num = [];
for (var i = 0; i < option.data.length; i++) {
@@ -2004,6 +2064,17 @@
return false;
}
}
+
+ //鎺掍骇宸ュ簭鏍囪
+ if (option.data[i]["HSortProcFlag"]) {
+ pc += 1;
+ }
+
+ if (pc > 1) {
+ layer.msg("鎺掍骇宸ュ簭鏍囪鍙兘閫夋嫨涓�涓�,璇烽噸鏂伴�夋嫨!");
+ return false;
+ }
+
//else {
// if (option.data[i]["HCenterID"] == "0") {
// layer.msg("绗�" + (i + 1) + "琛�:宸ヤ綔涓績涓嶈兘涓虹┖!");
@@ -2044,7 +2115,6 @@
}
}
}
-
return true;
}
@@ -2108,7 +2178,7 @@
function btn_under(data) {
if (data.length != 1) {
layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
- } else if (option.data[option.data.length-1]["HProcNo"] == data[0]["HProcNo"]) {
+ } else if (option.data[option.data.length - 1]["HProcNo"] == data[0]["HProcNo"]) {
layer.msg("鏈鏁版嵁鏃犳硶绉诲姩锛�");
} else {
var tables = [];
@@ -2215,10 +2285,54 @@
})
}
//#endregion
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return null;
+ };
});
+ //鐗╂枡
+ function GetMaterValue(obj) {
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(obj[0].HItemID);//鐗╂枡id
+ $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+ $("#HMaterModel").val(obj[0].瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
+ $("#HUnitID").val(obj[0].HUnitID);//璁￠噺鍗曚綅id
+ $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+ if ($("#HName").val() == "") {
+ $("#HName").val(obj[0].鐗╂枡浠ｇ爜);
+ }
+ }
+ //璁￠噺鍗曚綅
+ function GetUnitValue(obj) {
+ $("#HUnitID").val(obj[0].HItemID);//璁￠噺鍗曚綅id
+ $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+ }
+
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ OptionData= obj;
+ }
+
+ //宸ヤ綔涓績
+ function GetWorkCenterValue(obj) {
+ OptionData = obj;
+ }
+
+ //渚涘簲鍟�
+ function GetHSupNameValue(obj) {
+ OptionData = obj;
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1