From 3d240d150e6e1a4e2df1a9f87d00ddd03ace4ee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 一月 2025 10:06:37 +0800
Subject: [PATCH] 增加 BOM层级展开报表,修复全程追溯报表 黑白标页签导出失败,工艺路线的表头查询优化页面排序
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 128 ++++++++++++++++++++++++++++++++++--------
1 files changed, 104 insertions(+), 24 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_RoutingBillList.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_RoutingBillList.html"
index aa3c505..0b0275e 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_RoutingBillList.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_RoutingBillList.html"
@@ -55,21 +55,17 @@
<input type="text" class="layui-input ForFilteringSchemes" name="WorkCenter" id="WorkCenter">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="hidden" class="layui-input " lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" 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" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
- </div>
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="hidden" class="layui-input " lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" 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: 76px;">鐗╂枡鍚嶇О</label>
@@ -106,7 +102,10 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
</div>
-
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div class="layui-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
@@ -219,14 +218,16 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(瀹氶鐢宠鍗�)</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_BulkEditWorkTime" id="btn_BulkEditWorkTime"><i class="layui-icon layui-icon-set"></i>鎵规敼灏忔椂浜ц兘</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SourceWorkQty" id="btn_SourceWorkQty"><i class="layui-icon layui-icon-set"></i>浜х嚎浜ц兘</button>
</div>
</script>
</form>
@@ -390,6 +391,12 @@
//璇诲彇鏂规
case 'btn_ReadScheme': set_ReadScheme();
break;
+ //鎵规敼灏忔椂浜ц兘
+ case 'btn_BulkEditWorkTime': set_BulkEditWorkTime();
+ break;
+ //浜х嚎浜ц兘
+ case 'btn_SourceWorkQty': set_SourceWorkQty();
+ break;
};
});
@@ -485,7 +492,7 @@
set_InitGrid();
Organ();
//鏌ヨ
- get_FastQuery(1);
+ //get_FastQuery(1);
//鑾峰彇椤圭洰鍙�
Get_HProject();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -614,6 +621,32 @@
l.LAY_CHECKED = flag;
}
});
+ })
+ //#endregion
+
+ //#region 鍙屽嚮琛屽脊鍑哄脊妗嗭紝缁存姢涓嶅悓鐢熶骇璧勬簮鐨勫皬鏃朵骇鑳�
+ table.on('rowDouble(mainTable)', function (obj) {
+ var HMaterNumber = obj.data.鐗╂枡浠ｇ爜;
+ var HMaterName = obj.data.鐗╂枡鍚嶇О;
+ var HMaterModel = obj.data.瑙勬牸鍨嬪彿;
+ var HProcName = obj.data.宸ュ簭;
+ var HBillInterID = obj.data.hmainid;
+ var HBillEntryID = obj.data.hsubid;
+ var HSortProcFlag = obj.data.鎺掍骇宸ュ簭鏍囪;
+
+ if (HSortProcFlag == "true" || HSortProcFlag == "1" || HSortProcFlag == "鏄�" || HSortProcFlag == true) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮浜ц兘璁剧疆'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillWorkQty.html?HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel + '&HProcName=' + HProcName + '&HBillInterID=' + HBillInterID + '&HBillEntryID=' + HBillEntryID, 'yes']
+ })
+ } else {
+ layer.msg('鎵�閫夊伐搴忥細' + HProcName + '锛屼笉涓烘帓浜у伐搴忥紒');
+ }
})
//#endregion
@@ -1362,7 +1395,7 @@
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-
+
}
});
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
@@ -1448,7 +1481,7 @@
layer.close(index);
}
//layer.closeAll('dialog');
-
+
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
@@ -1665,7 +1698,7 @@
if (HProject != '0') {
sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
}
-
+
sWhere += " and 宸ュ簭浠ｇ爜 != '9999' and HBillSubType<>'SUB'"
//鏌ヨ璇彞
$.ajax({
@@ -1823,7 +1856,7 @@
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
$("#btnSearch").trigger('click');
-
+
});
} else {
@@ -1997,7 +2030,7 @@
// if (dataCol[i]) {
// var dataCols = dataCol[i].split('|');
// }
-
+
// //闅愯棌鍒�
// if (dataCols[1] == 1) {
// option.cols[0][i + 1]["hide"] = true;
@@ -2417,6 +2450,53 @@
//#endregion
+ //#region 鎵规敼灏忔椂浜ц兘
+ function set_BulkEditWorkTime() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鎵规敼灏忔椂浜ц兘" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "80%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['./Gy_BulkEditWorkQty.html', "yes"]
+ })
+ }
+ //#endregion
+
+ //#region 浜х嚎浜ц兘
+ function set_SourceWorkQty() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HMaterNumber = data[0].鐗╂枡浠ｇ爜;
+ var HMaterName = data[0].鐗╂枡鍚嶇О;
+ var HMaterModel = data[0].瑙勬牸鍨嬪彿;
+ var HProcName = data[0].宸ュ簭;
+ var HBillInterID = data[0].hmainid;
+ var HBillEntryID = data[0].hsubid;
+ var HSortProcFlag = data[0].鎺掍骇宸ュ簭鏍囪;
+
+ if (HSortProcFlag == "true" || HSortProcFlag == "1" || HSortProcFlag == "鏄�" || HSortProcFlag == true) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮浜ц兘璁剧疆'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillWorkQty.html?HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel + '&HProcName=' + HProcName + '&HBillInterID=' + HBillInterID + '&HBillEntryID=' + HBillEntryID, 'yes']
+ })
+ } else {
+ layer.msg('鎵�閫夊伐搴忥細' + HProcName + '锛屼笉涓烘帓浜у伐搴忥紒');
+ }
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
--
Gitblit v1.9.1