From 7bb3ffb383e41f66ea9e89b8b0f8182726e77d1b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 27 一月 2026 15:14:07 +0800
Subject: [PATCH] 华舟 新增 器具保养规程 器具点检规程 设备点检规程 设备保养规程 的默认结果选择
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 616 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 426 insertions(+), 190 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 0b0275e..8c676d7 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"
@@ -1,4 +1,4 @@
-锘�<!DOCTYPE html>
+锘� <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -13,7 +13,8 @@
<script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
<script src="../../../layuiadmin/pubcustom.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
@@ -55,12 +56,12 @@
<input type="text" class="layui-input ForFilteringSchemes" name="WorkCenter" id="WorkCenter">
</div>
</div>
- <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+ <div class="layui-row" style="margin-top:10px;margin-left:4%;">
<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;">
+ <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>
@@ -77,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>
@@ -97,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;">
@@ -135,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">
@@ -163,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">
@@ -196,14 +203,14 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<div id="page" style="position:relative;bottom:0;"></div>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <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>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</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_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_defaultRoute" id="set_defaultRoute"><i class="layui-icon layui-icon-form"></i>鍚敤榛樿</button>
@@ -216,16 +223,16 @@
<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>
- <!--<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="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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></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>
@@ -257,11 +264,13 @@
var sWhere = "";
var option = [];
var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
- var HBillType = 3301;
+ var size = 50;
var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "Gy_RoutingBillList";
- var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var HBillType = 3301;
+ var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HMaterID", "HUnitID", "HOrgID", "hsubid", "HProcID", "HSupID", "HCenterID", "HMainCenterID", "HMainProcID", "HCenterID_S", "HProcID_S", "HItemID", "HPRDORGID", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWhID", "HWHName", "HBillSubType", "HQCSchemeID_Fst", "HQCSchemeID_Proc","HQCSchemeID_Patrol"];
//#region 銆愯繃婊ゆ柟妗堛��
@@ -370,20 +379,31 @@
//鍙嶅叧闂�
case 'set_CancelCloseBill': set_CloseBill(2);
break;
+ //鍙嶅叧闂缃椂闂�
+ case 'set_CancelCloseBillSetDate': set_CloseBillSetDate(2);
+ break;
+ //浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+ case 'btn-Drop':set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'btn-DeDrop':set_DropBill(2);
+ break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
- break;
- //鍒楄缃�
- case 'set_HideColumn': get_HideColumn();
- break;
+ break;
//瀵煎嚭excel
case 'get_export':
get_Export();
break;
+ //瀵煎叆
+ case 'set_Excel': set_Excel();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
//鎸夐挳璁剧疆
case 'set_HideButton':
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- get_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
+ get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
break;
//淇濆瓨鏂规
case 'btn_SaveScheme': set_SaveScheme();
@@ -433,6 +453,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -490,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
@@ -505,6 +531,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-150'
+ , title: '宸ヨ壓璺嚎'
, page: false
, limit: 50
, done: function (res, curr, count) {
@@ -818,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
@@ -871,8 +898,15 @@
option.data = result;
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+ table.render(option);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
layer.close(ajaxLoad);
- DisPlay_HideColumn();
+
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
}
@@ -971,7 +1005,7 @@
com2 = "not like''%" + ColContent2 + "%''";
break;
default:
- com2 = "" + Comparator + "''" + ColContent + "''";
+ com2 = "" + Comparator2 + "''" + ColContent2 + "''";
break;
}
sWhere += " and " + ColName2 + " " + com2;
@@ -993,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 + "%''";
@@ -1016,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 + "%''";
@@ -1026,6 +1060,9 @@
}
sWhere += " and 宸ュ簭浠ｇ爜 != ''9999'' and HBillSubType<>''SUB''"
+
+ sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
+
//鍒ゆ柇鏉冮檺
if (PermissionJudge() == true) {
get_DisplayPage(sWhere);
@@ -1041,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;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -1059,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
@@ -1097,16 +1135,22 @@
}
}
option.data = result;
- laypage.render(optionPage);
-
+ debugger
+
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+ laypage.render(optionPage);
+ debugger
- layer.close(ajaxLoad);
+ ins = table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
if ($("#ColName option").length < 1) {
ColFilter();
}
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(ajaxLoad);
+
} else {
//option.data = [[]]
//table.render(option);
@@ -1132,7 +1176,7 @@
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=3301&linteridSub=-1'
, end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ get_FastQuery(2);
}
})
}
@@ -1149,7 +1193,7 @@
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=SUB&linteridSub=-1'
, end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ get_FastQuery(2);
}
})
}
@@ -1161,8 +1205,6 @@
if (checkStatus.data.length === 1) {
var linterid = data[0].HItemID;
//var linteridSub = data[0].hsubid;
-
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1171,7 +1213,7 @@
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
, end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ get_FastQuery(2);
}
})
} else {
@@ -1203,7 +1245,7 @@
//鍏抽棴褰撳墠frame
layer.close(wait);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ get_FastQuery(2);
});
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -1250,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
@@ -1314,7 +1381,7 @@
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3301'
, end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ get_FastQuery(2);
}
})
} else {
@@ -1324,8 +1391,8 @@
//#region 鍒锋柊
function get_Refresh() {
- set_ClearQuery();
- get_DisplayPage(sWhere);
+
+ get_FastQuery(2);
}
//鍚敤榛樿
@@ -1333,7 +1400,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (data.length == 1) {
+ if (data.length == 1 && data[0].鐘舵��!="鍏抽棴") {
layer.confirm("纭瑕佸惎鐢ㄨ宸ヨ壓璺嚎涓虹墿鏂欓粯璁ゅ伐鑹鸿矾绾垮悧?", function (index) {
var wait = layer.load();
var HInterID = data[0].hmainid;
@@ -1357,7 +1424,7 @@
});
})
} else {
- layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ layer.msg("璇烽�夋嫨涓�鏉℃湭鍏抽棴鐨勬暟鎹�!");
}
}
@@ -1365,7 +1432,7 @@
function set_closeOtherRoute() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1 && checkStatus.data[0]["瀹℃牳浜�"]=="") {
+ if (checkStatus.data.length === 1 && data[0].鐘舵�� != "鍏抽棴") {
var hmainid = data[0].hmainid.toString();
var HName = data[0]["宸ヨ壓鍚嶇О"].toString();
var HMaterID = data[0]["HMaterID"].toString();
@@ -1523,6 +1590,14 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
layer.close(wait);
}
+ , end: function () {
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
+ }
});
})
}
@@ -1531,7 +1606,138 @@
}
}
+ //鍏抽棴 [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')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Gy_RoutingBill/DeleteGy_RoutingBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": 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 瀵煎嚭Execel
function get_Export() {
@@ -1553,11 +1759,21 @@
}
if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ if (itemobj === '鐗╂枡浠ｇ爜') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
+ if (itemobj === '鐗╂枡鍚嶇О') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
+ if (itemobj === '瑙勬牸鍨嬪彿') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
}
}
});
if (result.count == 1) {
- table.exportFile(ins.config.id, data, "xls");
+ table.exportFile('mainTable', data, "xls");
layer.close(wait);
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
@@ -1570,6 +1786,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() {
@@ -1654,7 +1886,7 @@
com2 = "not like'%" + ColContent2 + "%'";
break;
default:
- com2 = "" + Comparator + "'" + ColContent + "'";
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
break;
}
sWhere += " and " + ColName2 + " " + com2;
@@ -1974,41 +2206,45 @@
}
//#endregion
+ $("#HBenchmarkValue").on("input", function (e) {
+ localStorage["HBenchmarkValue"] = e.delegateTarget.value;//鍩哄噯鍊硷紝鐢ㄤ簬娣诲悍璁＄畻绾﹀綋绯绘暟锛氬熀鍑嗗��/灏忔椂浜ц兘
+ });
+
//#endregion
- //闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length; i++) {
- colName += option.cols[0][i]["field"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ ////闅愯棌鍒楄缃�
+ //function get_HideColumn() {
+ // var colName = "";
+ // var contentUrl = "";
+ // for (var i = 1; i < option.cols[0].length; i++) {
+ // colName += option.cols[0][i]["field"] + ",";
+ // }
+ // var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ // var urlLen = urlStr.split('/');
+ // for (var i = 0; i < urlLen.length - 4; i++) {
+ // contentUrl += "../";
+ // }
+ // colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
+ // contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: [contentUrl, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
+ // layer.open({
+ // type: 2
+ // , skin: "layui-layer-rim" //鍔犱笂杈规
+ // , title: "闅愯棌鍒楄缃�" //鏍囬
+ // , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ // , shift: 2 //寮瑰嚭鍔ㄧ敾
+ // , area: ["50%", "90%"] //绐椾綋澶у皬
+ // , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ // , content: [contentUrl, "yes"]
+ // , btn: ["纭畾", "鍙栨秷"]
+ // , btn1: function (index, laero) {
+ // //鍒锋柊琛ㄦ牸鏁版嵁
+ // DisPlay_HideColumn();
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // layer.close(index);//鍏抽棴寮圭獥
+ // }
+ // })
+ //}
//鏄剧ず鍒楁暟鎹�
//function DisPlay_HideColumn() {
@@ -2108,104 +2344,104 @@
//}
//#region 鏄剧ず鍒楁暟鎹�
- function DisPlay_HideColumn() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- async: false,
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
+ //function DisPlay_HideColumn() {
+ // $.ajax({
+ // url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ // type: "GET",
+ // async: false,
+ // data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ // success: function (data1) {
+ // if (data1.data.length != 0) {
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
- newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
- dataCol = data1.data[0].HGridString.split(',');
- //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
- if (dataCol.length == option.cols[0].length - 1) {
- //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
- for (var j = 0; j < option.cols[0].length - 1; j++) {
- for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[j].split('|');
- //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
- if (option.cols[0][i + 1]["field"] == dataCols[5]) {
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //缁熻鍒�
- if (dataCols[6] == 1) {
- option.cols[0][i + 1]["totalRow"] = true;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option.cols[0][i + 1]["align"] = "right";
- break;
- }
- //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
- if (dataCols[4] != null && dataCols[4] != "") {
- option.cols[0][i + 1]["title"] = dataCols[4];
- }
- newCols[0].push(option.cols[0][i + 1]);
- }
- }
- }
- //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
- if (dataCol.length == newCols[0].length - 1) {
- option.cols = newCols;
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i]["fixed"] != null) {
- option.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
- data1.data[0].HFixCols += 1;
- }
- option.cols[0][i + 1]["fixed"] = "left";
- }
- }
- }
- }
- ins=table.render(option);
- } else {
- ins=table.render(option);
- }
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
- }
+ // var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ // var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ // var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ // newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ // dataCol = data1.data[0].HGridString.split(',');
+ // //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ // if (dataCol.length == option.cols[0].length - 1) {
+ // //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ // for (var j = 0; j < option.cols[0].length - 1; j++) {
+ // for (var i = 0; i < option.cols[0].length - 1; i++) {
+ // var dataCols = dataCol[j].split('|');
+ // //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ // if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ // //闅愯棌鍒�
+ // if (dataCols[1] == 1) {
+ // option.cols[0][i + 1]["hide"] = true;
+ // }
+ // //璁剧疆鍒楀
+ // if (dataCols[3] > 0) {
+ // option.cols[0][i + 1]["width"] = dataCols[3];
+ // }
+ // //璁剧疆鍐呭瀛椾綋澶у皬
+ // if (data1.data[0].HFontSize != 0) {
+ // option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ // } else {
+ // option.cols[0][i + 1]["style"] = "font-size:100%";
+ // }
+ // //鏄剧ず鍒�
+ // if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ // option.cols[0][i + 1]["hide"] = false;
+ // }
+ // //缁熻鍒�
+ // if (dataCols[6] == 1) {
+ // option.cols[0][i + 1]["totalRow"] = true;
+ // }
+ // //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ // switch (dataCols[2]) {
+ // case "L":
+ // option.cols[0][i + 1]["align"] = "left";
+ // break;
+ // case "M":
+ // option.cols[0][i + 1]["align"] = "center";
+ // break;
+ // case "R":
+ // option.cols[0][i + 1]["align"] = "right";
+ // break;
+ // }
+ // //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ // if (dataCols[4] != null && dataCols[4] != "") {
+ // option.cols[0][i + 1]["title"] = dataCols[4];
+ // }
+ // newCols[0].push(option.cols[0][i + 1]);
+ // }
+ // }
+ // }
+ // //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ // if (dataCol.length == newCols[0].length - 1) {
+ // option.cols = newCols;
+ // //鍙栨秷鍐荤粨鍒�
+ // for (var i = 1; i < option.cols[0].length - 1; i++) {
+ // if (option.cols[0][i]["fixed"] != null) {
+ // option.cols[0][i]["fixed"] = null;
+ // }
+ // else {
+ // break;
+ // }
+ // }
+ // //鍐荤粨鍒�
+ // if (data1.data[0].HFixCols != 0) {
+ // for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ // if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ // data1.data[0].HFixCols += 1;
+ // }
+ // option.cols[0][i + 1]["fixed"] = "left";
+ // }
+ // }
+ // }
+ // }
+ // ins=table.render(option);
+ // } else {
+ // ins=table.render(option);
+ // }
+ // var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ // Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // })
+ //}
//#endregion
@@ -2280,7 +2516,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
--
Gitblit v1.9.1