From 1c3ca496cc700359ea7b85fc4eae9b20be52cb80 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 10 十一月 2025 16:01:43 +0800
Subject: [PATCH] 出站汇报细节优化
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 221 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 194 insertions(+), 27 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 1de8d4d..4cbe021 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"
@@ -61,7 +61,7 @@
<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;">
+ <input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 75%;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>
@@ -78,6 +78,12 @@
<label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input ForFilteringSchemes" name="HModel" id="HModel">
+ </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 ForFilteringSchemes" name="HBenchmarkValue" id="HBenchmarkValue">
</div>
</div>
</div>
@@ -98,10 +104,10 @@
</select>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" style="display:none;" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">閲嶇疆</button>
</div>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
@@ -136,7 +142,7 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px; ">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -164,7 +170,7 @@
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -199,6 +205,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<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_Excel"><i class="layui-icon layui-icon-delete"></i>Excel瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>鏂板瀛愯矾绾�</button>
@@ -216,6 +223,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_WithdrawCheck_Flow" id="WithdrawCheck_Flow"><i class="layui-icon layui-icon-form"></i>鎾ゅ洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
<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="set_CancelCloseBillSetDate" id="set_CancelCloseBillSetDate"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�(璁剧疆鏃堕棿)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></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>
@@ -371,6 +379,9 @@
//鍙嶅叧闂�
case 'set_CancelCloseBill': set_CloseBill(2);
break;
+ //鍙嶅叧闂缃椂闂�
+ case 'set_CancelCloseBillSetDate': set_CloseBillSetDate(2);
+ break;
//浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
case 'btn-Drop':set_DropBill(1);
break;
@@ -383,6 +394,9 @@
//瀵煎嚭excel
case 'get_export':
get_Export();
+ break;
+ //瀵煎叆
+ case 'set_Excel': set_Excel();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
@@ -439,6 +453,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -496,13 +511,18 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+
Organ();
- //鏌ヨ
- //get_FastQuery(1);
+
//鑾峰彇椤圭洰鍙�
Get_HProject();
+
+ //鏌ヨ
+ get_FastQuery(1);
+
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
+ $("#HBenchmarkValue").val(localStorage["HBenchmarkValue"])
}
//#endregion
@@ -511,6 +531,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-150'
+ , title: '宸ヨ壓璺嚎'
, page: false
, limit: 50
, done: function (res, curr, count) {
@@ -824,7 +845,7 @@
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'});
} else {
switch (data[i].Type) {
//int
@@ -879,7 +900,7 @@
option.data = result;
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
- table.render(option);
+ table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
@@ -1006,12 +1027,12 @@
if (HProID != 0 && HProID != "undefined" && HProID != null) {
sWhere += " and HMainProcID = " + HProID;
}
- if (number == 1) {
- HOrgID = sessionStorage["OrganizationID"];
- }
- else {
- HOrgID = $("#HOrgID").val();//缁勭粐
- }
+ //if (number == 1) {
+ // HOrgID = sessionStorage["OrganizationID"];
+ //}
+ //else {
+ // HOrgID = $("#HOrgID").val();//缁勭粐
+ //}
if (HOrderProcNO) {
sWhere += " and 鍗曟嵁绫诲瀷 like ''%" + HOrderProcNO + "%''";
@@ -1029,9 +1050,9 @@
if (WorkCenter) {
sWhere += " and 鍗曟嵁鍙� like ''%" + WorkCenter + "%''";
}
- if (HOrgID) {
- sWhere += " and HOrgID = ''" + HOrgID + "''";
- }
+ //if (HOrgID) {
+ // sWhere += " and HOrgID = ''" + HOrgID + "''";
+ //}
if (number == 2) {
if (HProject != '0') {
sWhere += " and 椤圭洰鍙� like ''%" + HProject + "%''";
@@ -1039,6 +1060,9 @@
}
sWhere += " and 宸ュ簭浠ｇ爜 != ''9999'' and HBillSubType<>''SUB''"
+
+ sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
+
//鍒ゆ柇鏉冮檺
if (PermissionJudge() == true) {
get_DisplayPage(sWhere);
@@ -1054,6 +1078,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_RoutingBill/page',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
success: function (data1) {
option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -1072,7 +1097,7 @@
if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', style:"color:blue; cursor: pointer;" });
} else {
switch (data[i].Type) {
//int
@@ -1110,21 +1135,21 @@
}
}
option.data = result;
-
+ debugger
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
laypage.render(optionPage);
- table.render(option);
+ debugger
+
+ ins = table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-
- layer.close(ajaxLoad);
-
- layer.close(ajaxLoad);
if ($("#ColName option").length < 1) {
ColFilter();
}
+ layer.close(ajaxLoad);
} else {
//option.data = [[]]
@@ -1267,6 +1292,31 @@
layer.closeAll("loading");
}
})
+ }
+ //#endregion
+
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+ function getOrgIDByUser() {
+ var res = "";
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURL() + "/Xt_User/getOrgIDListByUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� 浼犲弬 缁勭粐蹇呴』鏄垪琛ㄥご閮ㄦ煡璇㈢殑缁勭粐 涓嶈兘浣跨敤鐢ㄦ埛榛樿
+ data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HOrgID").val() },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data[0].sWhere == "1") {
+ res = " and HOrgID = ''" + $("#HOrgID").val() + "''";
+ } else {
+ res = result.data[0].sWhere;
+ }
+ }
+ }, error: function (err) {
+ res = " and 1 = 0";
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return res;
}
//#endregion
@@ -1556,6 +1606,103 @@
}
}
+ //鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
+ function set_CloseBillSetDate(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var HInterID = data[0].hmainid;
+ if (data.length == 1) {
+ // 寮瑰嚭灞�
+ layer.open({
+ type: 1,
+ title: '璁剧疆鏃堕棿鑼冨洿',
+ area: ['500px', '300px'],
+ content: `
+ <div class="layui-form" style="padding: 20px;">
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="startTime" placeholder="璇烽�夋嫨寮�濮嬫椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="endTime" placeholder="璇烽�夋嫨缁撴潫鏃堕棿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-input-block" style="margin-left: 0; text-align: center;">
+ <button class="layui-btn" id="confirmTime">纭畾</button>
+ <button class="layui-btn layui-btn-primary" id="cancelTime">鍙栨秷</button>
+ </div>
+ </div>
+ </div> `,
+ success: function (layero, index) {
+ $("#startTime").val(Format(new Date(), "yyyy-MM-dd"));
+ // 鑾峰彇褰撳墠鏃ユ湡
+ const currentDate = new Date();
+ // 鍒涘缓鏂版棩鏈熷璞★紙閬垮厤淇敼鍘熸棩鏈燂級
+ const after30Days = new Date(currentDate);
+ // 璁剧疆鏃ユ湡涓哄綋鍓嶆棩鏈� + 30澶�
+ after30Days.setDate(currentDate.getDate() + 30);
+ $("#endTime").val(Format(after30Days, "yyyy-MM-dd"));
+ // 纭畾鎸夐挳鐐瑰嚮浜嬩欢
+ $('#confirmTime').on('click', function () {
+ var startTime = $('#startTime').val();
+ var endTime = $('#endTime').val();
+
+ if (!startTime) {
+ layer.msg('璇烽�夋嫨寮�濮嬫椂闂�', { icon: 2 });
+ return;
+ }
+
+ if (!endTime) {
+ layer.msg('璇烽�夋嫨缁撴潫鏃堕棿', { icon: 2 });
+ return;
+ }
+
+ if (new Date(endTime) < new Date(startTime)) {
+ layer.msg('缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�', { icon: 2 });
+ return;
+ }
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseSetDate',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "", "HBeginDate": startTime, "HEndDate": endTime},
+ success: function (result) {
+ if (result.count == 1) {
+ // 杩欓噷鍙互澶勭悊鑾峰彇鍒扮殑鏃堕棿鑼冨洿
+ layer.msg('鏃堕棿鑼冨洿宸茶缃細' + startTime + ' 鑷� ' + endTime, { icon: 1 });
+ // 鍏抽棴寮瑰眰
+ layer.close(index);
+ $("#btnSearch").trigger('click');
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ // 鍏抽棴寮瑰眰
+ layer.close(index);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // 鍏抽棴寮瑰眰
+ layer.close(index);
+ }
+ });
+
+ });
+
+ // 鍙栨秷鎸夐挳鐐瑰嚮浜嬩欢
+ $('#cancelTime').on('click', function () {
+ layer.close(index);
+ });
+ },
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
//#region 鍙嶄綔搴�/浣滃簾鏁版嵁 [1 浣滃簾銆�2 鍙嶄綔搴焆
function set_DropBill(num) {
var checkStatus = table.checkStatus('mainTable')
@@ -1616,7 +1763,7 @@
}
});
if (result.count == 1) {
- table.exportFile(ins.config.id, data, "xls");
+ table.exportFile('mainTable', data, "xls");
layer.close(wait);
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
@@ -1629,6 +1776,22 @@
});
}
//#endregion
+
+ //瀵煎叆
+ function set_Excel() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎鍒楄〃-瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBillimport.html'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery();
+ }
+ })
+ }
//#region 鑾峰彇瀵煎嚭鏁版嵁
function getExportData() {
@@ -2033,6 +2196,10 @@
}
//#endregion
+ $("#HBenchmarkValue").on("input", function (e) {
+ localStorage["HBenchmarkValue"] = e.delegateTarget.value;//鍩哄噯鍊硷紝鐢ㄤ簬娣诲悍璁＄畻绾﹀綋绯绘暟锛氬熀鍑嗗��/灏忔椂浜ц兘
+ });
+
//#endregion
////闅愯棌鍒楄缃�
//function get_HideColumn() {
@@ -2339,7 +2506,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
--
Gitblit v1.9.1