From 24efc0b0d99502afdebb6ef678b0cf4e91dcb084 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 16 五月 2025 15:49:51 +0800
Subject: [PATCH] 组织物料启动检查项目防错装置优化
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 603 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 577 insertions(+), 26 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 b2ae33e..04fb572 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"
@@ -72,6 +72,12 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_Copy" id="set_Copy">澶嶅埗</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckFlowInfo" id="set_CheckFlowInfo">鏌ョ湅瀹℃壒杩涘害</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill_Flow" id="set_CheckBill_Flow">澶氱骇瀹℃牳</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck_Flow" id="set_AbandonCheck_Flow">澶氱骇鍙嶅鏍�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_RejectCheck_Flow" id="set_RejectCheck_Flow">椹冲洖</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_WithdrawCheck_Flow" id="set_WithdrawCheck_Flow">鎾ゅ洖</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -108,8 +114,8 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜*</label>
- <div class="layui-input-block" style="margin-left: 83px;">
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -426,7 +432,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-block" style="margin-left: 185px;">
- <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="杞伐搴�">
+ <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="杞伐搴�" disabled="disabled">
<input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo">
</div>
</div>
@@ -538,12 +544,18 @@
</script>
<script>
+ //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+ var childPage = null; //鑾峰彇瀛愮獥鍙ｅ璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙ｇ殑鍙橀噺鍜屾柟娉�
+ var currRowIndex = 0; //鐢ㄤ簬瀹氫綅瀛愮獥鍙ｅ綋鍓嶉�変腑鐨勮
+ var childData = null; //鐢ㄤ簬鑾峰彇瀛愮獥鍙ｈ繑鍥炵殑鏁版嵁
+ //#endregion
+
var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element','tableSelect'], function () {
//#region 鍏叡鍙橀噺
@@ -552,7 +564,8 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , tableSelect = layui.tableSelect;
//瀹氫箟鍏ㄥ眬鍙橀噺
var HReasonName, ReasonID, EmpName, SQProcName,
@@ -576,6 +589,7 @@
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0,"HYDCoefficient": 0
}];
var HModName = "Gy_RoutingBill";
//#endregion
@@ -603,8 +617,10 @@
, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }//f7
, { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
, { field: 'HProcPrice', title: '宸ヤ环', edit: 'text' }
+ , { field: '鏍囧噯宸ヤ环', title: '鏍囧噯宸ヤ环' }
+ , { field: 'HYDCoefficient', title: '绾﹀綋绯绘暟', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
+ , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }//f7
, { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
@@ -636,7 +652,9 @@
, { 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: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text', width: 125 }
+ , { field: 'HSubStdEmpQty_S', title: '浜х嚎浜烘暟', edit: 'text', width: 125 }
+ , { field: 'HSubStdEmpAvg_S', title: '浜哄潎浜ц兘', edit: 'text', width: 125}
//, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
//, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
////, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
@@ -670,7 +688,8 @@
//, { field: 'HAutoTrunFlag', title: '鑷姩绉昏浆', templet: "#HAutoTrunFlag" }//chenbox
//, { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text' }
//, { field: 'HProcWorkNum', title: '绋嬪簭鍙�', edit: 'text' }
- //, { field: 'HWorkTimes_S', title: '浜у搧鍗曚欢宸ユ椂', edit: 'text' }
+ /* , { field: 'HWorkTimes_S', title: '浜у搧鍗曚欢宸ユ椂', edit: 'text' }*/
+ , { field: 'HWorkTimes_S', title: '鍗曚欢鐢熶骇鑺傛媿', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
//, done: function (res, curr, count) {
@@ -736,7 +755,7 @@
HBillSubType = 3301
$("#HMaterID").val(params[params[3]]);//鐗╂枡ID
-
+ $("#HName").val(getParams("HMaterNumber"));//宸ヨ壓璺嚎鍚嶇О
$("#HMaterNumber").val(getParams("HMaterNumber"));//鐗╂枡浠ｇ爜
$("#HMaterName").val(getParams("HMaterName"));//鐗╂枡鍚嶇О
$("#HMaterModel").val(getParams("HMaterModel") == "" ? " " : getParams("HMaterModel"));//瑙勬牸鍨嬪彿
@@ -781,6 +800,8 @@
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
}
});
}
@@ -799,6 +820,120 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 琛ㄥご鍩虹璧勬枡閫夋嫨寮圭獥
+ //#region 鏂囨湰妗嗙洃鍚�
+ $(document).ready(function () {
+ //#region 鏍规嵁鐗╂枡浠ｇ爜鑾峰彇鐗╂枡鍩虹璧勬枡绛涢�夊脊绐�
+ //鏍规嵁鍏冪礌ID瀵瑰厓绱犺繘琛岀洃鍚�=============================================================================
+ $("#HMaterNumber").on('keydown', function (data) {
+ //================================================================================================
+ var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+ if ($.inArray(event.key, errKeys) == -1) { //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+ if (childPage == null) { //鍒ゆ柇褰撳墠瀛愮獥鍙ｆ槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙ｇ殑瀵硅薄
+ var offset = $(this).offset(); //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+ var innerHeight = window.innerHeight;
+ var top = offset.top + 0.05 * innerHeight;
+ var left = offset.left;
+ if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+ top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+ }
+ layer.open({
+ type: 2 //寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['25%', '30%'] //澶у皬
+ , shadeClose: true //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+ , offset: [top, left]
+ , title: false //涓嶆樉绀烘爣棰樻爮
+ //, title: '椤圭洰璐圭敤鍒楄〃' //鏍囬
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , closeBtn: 0 //绂佺敤鍏抽棴鎸夐挳
+ , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+ , success: function (layero, index) {
+ setTimeout(function () {
+ //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+ var value = $("#HMaterNumber").val().replace(/'/g, ""); //鑾峰彇鏂囨湰妗嗘渶鏂板��
+ currRowIndex = 0;
+ var tableView = "h_v_Gy_MaterialList";
+ var childSWhere = "select top(10) HItemID,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁￠噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠ｇ爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠ｇ爜 desc";
+ childPage.getData(childSWhere, tableView);
+ //===================================================================================================================================
+ }, 200);
+ }
+ , end: function () {
+ childPage = null;
+ currRowIndex = 0;
+ if (childData != null) {
+ //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(childData.HItemID);//鐗╂枡id
+ $("#HMaterName").val(childData.鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val(childData.鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+ $("#HMaterModel").val(childData.瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
+ $("#HUnitID").val(childData.HUnitID);//璁￠噺鍗曚綅id
+ $("#HUnitName").val(childData.璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+ if ($("#HName").val() == "") {
+ $("#HName").val(childData.鐗╂枡浠ｇ爜);
+ }
+ //===============================================================================================================================
+
+ childData = null;
+ }
+ }
+ });
+ } else {
+ setTimeout(function () {
+ //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+ var value = $("#HMaterNumber").val().replace(/'/g, ""); //鑾峰彇鏂囨湰妗嗘渶鏂板��
+ currRowIndex = 0;
+ var tableView = "h_v_Gy_MaterialList";
+ var childSWhere = "select top(10) HItemID,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁￠噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠ｇ爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠ｇ爜 desc";
+ childPage.getData(childSWhere, tableView);
+ //=================================================================================================================================
+ }, 200);
+ }
+ } else { //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙ｄ腑 閫変腑琛� 鐨勪綅缃�
+ if (event.key == "ArrowUp") {
+ currRowIndex--;
+ childPage.setSelectedRow(currRowIndex);
+ } else if (event.key == "ArrowDown") {
+ currRowIndex++;
+ childPage.setSelectedRow(currRowIndex);
+ } else if (event.key == "Enter") {
+ //鎵嬪姩澶辩劍
+ var element = document.getElementById("HMaterNumber");
+ element.blur();
+
+ childPage.getSelectedData(currRowIndex);
+
+ if (childData != null) {
+ //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(childData.HItemID);//鐗╂枡id
+ $("#HMaterName").val(childData.鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val(childData.鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+ $("#HMaterModel").val(childData.瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
+ $("#HUnitID").val(childData.HUnitID);//璁￠噺鍗曚綅id
+ $("#HUnitName").val(childData.璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+ if ($("#HName").val() == "") {
+ $("#HName").val(childData.鐗╂枡浠ｇ爜);
+ }
+ //===============================================================================================================================
+
+ childData = null;
+ }
+
+
+ childPage = null;
+ currRowIndex = 0;
+ childData = null;
+ }
+ }
+ });
+ //#endregion
+ });
+ //#endregion
+ //#endregion
+
//閫夋嫨浜у搧浠ｇ爜鎸夐挳
form.on('submit(btnSearchMater)', function () {
@@ -868,6 +1003,32 @@
set_CancelCloseBill(data);
});
+ //鏌ョ湅瀹℃壒杩涘害
+ form.on('submit(set_CheckFlowInfo)', function (data) {
+ set_CheckFlowInfo();
+ });
+
+ //澶氱骇瀹℃牳
+ form.on('submit(set_CheckBill_Flow)', function (data) {
+ set_CheckBill_Flow(0);
+ });
+
+ //澶氱骇鍙嶅鏍�
+ form.on('submit(set_AbandonCheck_Flow)', function (data) {
+ set_CheckBill_Flow(1);
+ });
+ //椹冲洖
+ form.on('submit(set_RejectCheck_Flow)', function (data) {
+ set_RejectCheck_Flow();
+ });
+ //鎾ゅ洖
+ form.on('submit(set_WithdrawCheck_Flow)', function (data) {
+ set_WithdrawCheck_Flow();
+ });
+ //澶嶅埗
+ form.on('submit(set_Copy)', function (data) {
+ set_Copy();
+ });
//鏄惁榛樿宸ヨ壓
form.on('checkbox(checkboxHStandard)', function (data) {
@@ -1034,7 +1195,7 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HProcNo": (table.cache["mainTable"].length + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": ""
+ "HProcNo": (table.cache["mainTable"].length + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": "","宸ュ簭浠ｇ爜":""
, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": "","宸ユ":""
, "HProcID": 0, "宸ヤ綔涓績浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績": "", "HSupID": 0
@@ -1050,6 +1211,7 @@
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0, "HYDCoefficient": 0
};
switch (obj.event) {
case 'btn-AddLine':
@@ -1214,6 +1376,41 @@
}
})
+ //鏄庣粏缃戞牸鍗曞厓鏍肩紪杈戜簨浠�
+ table.on('edit(mainTable)', function (obj) {
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ switch (field) {
+ case 'HSubStdEmpQty_S': //浜х嚎浜烘暟
+ if (value != 0 && value != "" && data.HSubStdEmpAvg_S != 0 && data.HSubStdEmpAvg_S != "") {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HWorkQty: Number((value * data.HSubStdEmpAvg_S).toFixed(2))
+ });
+ //table.render(option)
+ }
+ break;
+ case 'HSubStdEmpAvg_S': //浜х嚎浜哄潎浜ц兘
+ if (value != 0 && value != "" && data.HSubStdEmpQty_S != 0 && data.HSubStdEmpQty_S != "") {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HWorkQty: Number((value * data.HSubStdEmpQty_S).toFixed(2))
+ });
+ //table.render(option)
+ }
+ break;
+ case 'HWorkQty': //绾﹀綋绯绘暟
+ if (localStorage["HBenchmarkValue"] != undefined && localStorage["HBenchmarkValue"] != null && data.HWorkQty > 0) {
+ obj.update({
+ HYDCoefficient: !isNaN(parseFloat((localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6) : 0
+ });
+ }
+ break;
+
+ }
+ })
+
$('#HName').on('keydown', function (event) {//宸ヨ壓璺嚎鍚嶇О
if (event.keyCode == 118) {
layer.msg("宸ヨ壓璺嚎鍚嶇ОF7鎸夐挳")
@@ -1222,11 +1419,36 @@
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- if (AllowLoadData(data)) {
- set_AddNew(data);
+ const procNos = table.cache["mainTable"].map(item => Number(item.HProcNo));
+ if (isSortedAscending(procNos) && haveHProcNO9999()) {
+ if (AllowLoadData(data)) {
+ set_AddNew(data);
+ }
+ } else {
+ layer.msg('璇锋敞鎰忔祦姘村彿娆″簭鎴栬�呮槸鍚︽湁杞伐搴�');
}
});
-
+ // 鍑芥暟锛氬垽鏂暟缁勬槸鍚︿粠灏忓埌澶ф帓搴�
+ function isSortedAscending(arr) {
+ for (let i = 0; i < arr.length - 1; i++) {
+ if (arr[i] > arr[i + 1]) {
+ return false;
+ }
+ }
+ return true;
+ }
+ //澶嶅埗鏃朵繚璇佽浆宸ュ簭瀛樺湪
+ function haveHProcNO9999() {
+ if (OperationType == 2 || OperationType == 3) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HProcNo"] == 9999 && option.data[i]["宸ュ簭浠ｇ爜"] == 9999) {
+ return true
+ }
+ }
+ return false;
+ }
+ return true;
+ }
//閫�鍑�
form.on('submit(btnEdit)', function (data) {
if (params[1] != null) {
@@ -1620,9 +1842,9 @@
var wait = layer.load();
var HInterID = $("#HInterID").val();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
type: "GET",
- data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "3301"},
success: function (result) {
if (result.count == 1) {
//妫�鏌ユ槸鍚﹀叿澶囧惎鐢ㄩ粯璁ゅ伐鑹鸿矾绾跨殑鏉冮檺锛屽瓨鍦紝鍒欏脊绐楁彁闂�
@@ -1676,11 +1898,12 @@
//鍙嶅鏍�
function set_AbandonCheck() {
layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
+ var HInterID = $("#HInterID").val();
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -1700,11 +1923,12 @@
//鍏抽棴
function set_CloseBill() {
layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var HInterID = $("#HInterID").val();
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -1724,11 +1948,12 @@
//鍙嶅叧闂�
function set_CancelCloseBill() {
layer.confirm("纭瑕佸弽鍏抽棴鍚�?", function (index) {
+ var HInterID = $("#HInterID").val();
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -1744,6 +1969,163 @@
});
})
}
+
+ //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill_Flow(num) {
+ var InterID = $("#HInterID").val();
+ if (InterID != 0) {
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Routing/AuditFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨璇烽�夋嫨鍦ㄥ鎵规祦鐨勫崟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 椹冲洖
+ function set_RejectCheck_Flow() {
+ var InterID = $("#HInterID").val();
+ if (InterID != 0) {
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨鍦ㄥ鎵规祦鐨勫崟鎹┏鍥烇紒');
+ }
+ }
+ //#endregion
+
+ //#region 鎾ゅ洖
+ function set_WithdrawCheck_Flow() {
+ var InterID = $("#HInterID").val();
+ if (InterID != 0) {
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Routing/WithdrawCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨鍦ㄥ鎵规祦鐨勫崟鎹┏鍥烇紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_Copy() {
+ $('#btnSave').removeClass("layui-btn-disabled").attr("disabled", false);
+ //鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#hmakers").val(sessionStorage["HUserName"]);
+ $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
+ //璁剧疆hinterid
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3301' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ });
+ OperationType = 2;
+ }
+ //#endregion
+
+ //#region 鏌ョ湅瀹℃壒杩涘害
+ function set_CheckFlowInfo() {
+ var InterID = $("#HInterID").val();
+ if (InterID != 0) {
+ layer.open({
+ type: 2
+ , area: ['70%', '70%']
+ , title: '鍗曟嵁瀹℃壒杩涘害'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../绯荤粺绠＄悊/澶氱骇瀹℃壒/瀹℃壒杩涘害/Xt_CheckFlowProgressList.html?linterid=' + InterID + '&HSouceBillType=3301'
+ , resize: false,
+ end: function () {
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
+ }
+ , cancel: function () {
+
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨姝ｇ‘鏁版嵁鏌ョ湅锛�');
+ }
+ }
+ //#endregion
//琛屽唴鍒犻櫎蹇嵎閿�
function set_GridCellCheck(obj) {
@@ -1852,6 +2234,9 @@
option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
option.data[i]["HProcID_S"] = checkStatus.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = checkStatus.data[j]["宸ユ鍚嶇О"];
+ option.data[i]["鏍囧噯宸ヤ环"] = checkStatus.data[j]["鏍囧噯宸ヤ环"];
+
+
j++;
}
@@ -1873,7 +2258,8 @@
, "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
- , "HQCFst": false, "HQCProc": false, "HQCPatrol": false,"HMaterToSourceCtrl":false
+ , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0, "HYDCoefficient": 0
})
j++;
}
@@ -1889,6 +2275,9 @@
option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
option.data[i]["HProcID_S"] = checkStatus.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = checkStatus.data[j]["宸ユ鍚嶇О"];
+ option.data[i]["鏍囧噯宸ヤ环"] = checkStatus.data[j]["鏍囧噯宸ヤ环"];
+ option.data[i]["HWorkQty"] = option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"];
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6) : 0;//绾﹀綋绯绘暟=鍩哄噯鍊�/灏忔椂浜ц兘
j++;
}
}
@@ -1921,6 +2310,10 @@
, "宸ヤ綔涓績浠ｇ爜": OptionData[0].宸ヤ綔涓績浠ｇ爜
, "HProcID_S": OptionData[0].HProcMulID
, "宸ユ": OptionData[0].宸ユ鍚嶇О
+ , "鏍囧噯宸ヤ环": OptionData[0].鏍囧噯宸ヤ环
+ , "HWorkQty": obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty
+ , "HYDCoefficient": !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6) : 0
+
})
OptionData = [];
}
@@ -2228,6 +2621,151 @@
}
})
+
+ //宸ュ簭琛ㄦ牸涓嬫媺鎼滅储妗�
+ tableSelect.render({
+ elem: 'td[data-field="宸ュ簭"] .layui-table-edit',
+ searchKey: '宸ュ簭浠ｇ爜,宸ュ簭鍚嶇О',
+ sWhere: " and 鏄庣粏鏍囪 = 'Y' and 绂佺敤鏍囪 != 'Y'",//table鎼滅储sWhere鏉′欢
+ ajaxSelect: function (sWhere) {
+ var data = '';
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Process/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ data = data1.data
+ }
+ },
+ error: function () {
+ layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+ }
+ });
+ return data;
+ },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+ table: {
+ cols: [[
+ { type: 'radio', fixed: 'left' },
+ { field: 'HItemID', title: 'HItemID', hide: true },
+ { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' },
+ { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' },
+ { field: 'HProcMulID', title: 'HProcMulID', hide: true },
+ { field: '宸ユ鍚嶇О', title: '宸ユ鍚嶇О' }
+ ]],
+ page: true,
+ limit: 5,
+ //limits: [5]
+ },
+ done: function (elem, data) {
+ $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+ //鑾峰彇宸ュ簭浠ｇ爜
+ var ProcessNumber = [];
+ for (var i = 0; i < data.data.length; i++) {
+ ProcessNumber.push("'" + data.data[i]["宸ュ簭浠ｇ爜"] + "'");
+ }
+
+ //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+ var NowNum = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
+ NowNum = i + 1;
+ }
+ }
+
+ //鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
+ var WorkCente = [];
+ var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠ｇ爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О,p.HStandardWages 鏍囧噯宸ヤ环 from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ WorkCente = data.data;
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ });
+
+ //鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
+ if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
+ //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
+ var num = ProcessNumber.length - option.data.length + (NowNum - 1);
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < option.data.length; i++) {
+ option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["宸ュ簭浠ｇ爜"] = ProcessNumber[j].substring(1, ProcessNumber[j].length - 1);
+ option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+ option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+ option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+ option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
+ option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
+ option.data[i]["鏍囧噯宸ヤ环"] = WorkCente[j]["鏍囧噯宸ヤ环"];
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;
+
+ j++;
+ }
+
+ //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
+ for (var i = 0; i < num; i++) {
+ option.data.push({
+ "HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": "", "宸ュ簭浠ｇ爜": ProcessNumber[j].substring(1, ProcessNumber[j].length - 1)
+ , "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, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
+ , "HWorkQty": 1, "HSNCtrl": false, "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": "", "HWorkTimes_S": 0
+ , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
+ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
+ , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
+ , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0, "HYDCoefficient": 0
+ })
+ j++;
+ }
+ } else {
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
+ option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["宸ュ簭浠ｇ爜"] = ProcessNumber[j].substring(1, ProcessNumber[j].length - 1);
+ option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+ option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+ option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+ option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
+ option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
+ option.data[i]["鏍囧噯宸ヤ环"] = WorkCente[j]["鏍囧噯宸ヤ环"];
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;
+ j++;
+ }
+ }
+ table.render(option);
+
+
+
+ //setTableByHMater(obj, data);
+ }
+ })
+
+
}
//缂栬緫 椤甸潰璧嬪��
@@ -2320,6 +2858,7 @@
, "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].宸℃妫�楠屾柟妗�
, "HQCFst": d.data[i].HQCFst == 1 ? true : false, "HQCProc": d.data[i].HQCProc == 1 ? true : false, "HQCPatrol": d.data[i].HQCPatrol == 1 ? true : false, "HMaterToSourceCtrl": d.data[i].HMaterToSourceCtrl == 1 ? true : false
+ , "HSubStdEmpAvg_S": d.data[i].浜哄潎浜ц兘, "鏍囧噯宸ヤ环": d.data[i].鏍囧噯宸ヤ环, "HYDCoefficient": d.data[i].绾﹀綋绯绘暟
}
)
}
@@ -2378,6 +2917,14 @@
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+
+ //鍔犲伐鏁伴噺=浜х嚎浜烘暟 * 浜х嚎浜哄潎浜ц兘
+ if (table.cache["mainTable"][i].HSubStdEmpQty_S != 0 && table.cache["mainTable"][i].HSubStdEmpQty_S != "" && table.cache["mainTable"][i].HSubStdEmpAvg_S != 0 && table.cache["mainTable"][i].HSubStdEmpAvg_S != "") {
+
+ table.cache["mainTable"][i].HWorkQty = Number((table.cache["mainTable"][i].HSubStdEmpQty_S * table.cache["mainTable"][i].HSubStdEmpAvg_S).toFixed(2))
+
+ }
+
num.push(table.cache["mainTable"][i])
}
}
@@ -2501,7 +3048,7 @@
//}
//else {
- // if (option.data[i]["HCenterID"] == "0") {
+ // if (option.data[i]["HCenterID"] == "0"&&option.data[i]["宸ュ簭浠ｇ爜"] != "9999") {
// layer.msg("绗�" + (i + 1) + "琛�:宸ヤ綔涓績涓嶈兘涓虹┖!");
// return false;
// }
@@ -2623,7 +3170,9 @@
//鍒锋柊娴佹按鍙�
function btn_Refresh(data) {
for (var i = 0; i < option.data.length; i++) {
- option.data[i]["HProcNo"] = (i + 1) * 10;
+ if (option.data[i]["HProcNo"] != 9999) {
+ option.data[i]["HProcNo"] = (i + 1) * 10;
+ }
}
table.render(option);
}
@@ -2646,8 +3195,10 @@
if (i >= dataCol.length) {
continue;
}
-
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
--
Gitblit v1.9.1