From 0e72054c504acc8c8dd9299016e3f08592faf69e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 11 六月 2025 13:27:09 +0800
Subject: [PATCH] 工艺参数分类: 增加超链接功能 添加编辑页面审核功能 修复日期显示为空白 添加已审核单据的保护 设备保养规程：调整页面布局 单据号添加超链接 子表添加列设置 添加已审核单据的保护 添加编辑页面审核功能 添加双击返回和批量返回 添加不可编辑列样式 设备点检规程 修改网格高度 单据号添加超链接 添加已审核单据的保护 修改点检周期值未带入和页面异常 添加刷双击返回 添加编辑页面审核功能 添加子表列设置
---
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList.html | 120 ++++++++---
WebTM/WebTM.csproj.user | 4
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html | 17 +
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_TechnologyParameterType.html | 56 +++++
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html | 105 +++++++++-
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleList.html | 139 +++++++++++--
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterType.html | 47 ++++
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html | 55 ++++-
WebTM/layuiadmin/layui-common-custom.js | 22 --
9 files changed, 450 insertions(+), 115 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 89909e4..8cc4879 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,9 +2,9 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/layui-common-custom.js b/WebTM/layuiadmin/layui-common-custom.js
index 96f4f43..1a5977c 100644
--- a/WebTM/layuiadmin/layui-common-custom.js
+++ b/WebTM/layuiadmin/layui-common-custom.js
@@ -19,27 +19,7 @@
});
}
-// 娓呴櫎鍒跺崟淇℃伅
-function Clear_BillMakeMsg(formLayui, formWrapperStr) {
- if (typeof Object.assign === 'function') {
- let formObj = formLayui.val(formWrapperStr)
- formObj['HMaker'] = sessionStorage['HMaker']
- formObj['HMakeDate'] = ''
- formObj['HChecker'] = ''
- formObj['HCheckDate'] = ''
- formObj['HUpDater'] = ''
- formObj['HUpDateDate'] = ''
- formObj['HCloseMan'] = ''
- formObj['HCloseDate'] = ''
- formObj['HDeleteMan'] = ''
- formObj['HDeleteDate'] = ''
- formObj['HStopMan'] = ''
- formObj['HStopDate'] = ''
- form.val(formWrapperStr, formObj);
- }
-}
-
-// 璁剧疆涓嶅彲缂栬緫鍒� / 闅愯棌鍒�
+// 璁剧疆涓嶅彲缂栬緫鍒� / 闅愯棌鍒� 璁剧疆鍙紪杈戝垪
function setUneditableCol(option, editable, hideCols) {
if (Array.isArray(editable) !== true) {
return
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_TechnologyParameterType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_TechnologyParameterType.html"
index f7ce528..1bd9689 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_TechnologyParameterType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_TechnologyParameterType.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
</head>
<body>
@@ -25,6 +26,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Checker">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -32,7 +34,7 @@
<div class="layui-tab layui-tab-brief">
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
- <li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -100,7 +102,7 @@
</div>
</div>
</div>
- <!--鍏朵粬淇℃伅-->
+ <!--鍒跺崟淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-row">
@@ -215,7 +217,7 @@
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "SaveGy_TechnologyTypeList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/SaveGy_TechnologyTypeList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "msg": sMainStr },
dataType: "json",
@@ -237,6 +239,36 @@
}
});
});
+
+ //瀹℃牳
+ form.on('submit(Checker)', function (data) {
+ var InterID = linterid
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_BadReason/AuditGy_TechnologyParameterClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "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);
+
+ $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
+ $("#check-btn").addClass("layui-btn-disabled").attr("disabled", true);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //$("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ })
+
//閫�鍑�
form.on('submit(Exit)', function (data) {//
if (linterid == undefined) {
@@ -266,6 +298,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
+ $("#check-btn").addClass("layui-btn-disabled").attr("disabled", true);
$("#HUSEORGID").attr("disabled", true);
$("#HCREATEORGID").attr("disabled", true);
$("#HStopflag").attr("disabled", true);
@@ -287,7 +320,7 @@
function set_EditForm(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
- url: GetWEBURL() + "GetGy_TechnologyTypeDetail",
+ url: GetWEBURL() + "/GetGy_TechnologyTypeDetail",
type: "GET",
async: false,
data: {
@@ -313,6 +346,21 @@
$("#HCheckTime").val(data.瀹℃牳鏃堕棿 == null ? "" : Format(new Date(data.瀹℃牳鏃堕棿), "yyyy-MM-dd"));
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+ if (OperationType != 2) {
+ if (isEmpty(data["瀹℃牳浜�"]) === false) {
+ $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
+ } else {
+ $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false)
+ }
+ } else {
+ $("#HMakeEmp").val(sessionStorage["HMaker"]);
+ $("#HMakeTime").val("");
+ $("#HStopEmp").val("");
+ $("#HStopTime").val("");
+ $("#HCheckEmp").val("");
+ $("#HCheckTime").val("");
+ }
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterType.html"
index f8e73fa..a9084a4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterType.html"
@@ -15,6 +15,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
</head>
<body>
@@ -273,6 +274,15 @@
break;
};
});
+
+ //琛ㄦ牸鑷畾涔変簨浠剁洃鍚�
+ table.on('tool(mainTable)', function (obj) {
+ let data = obj.data
+ switch (obj.event) {
+ case "onTechParamUnitCodeClickHandler": onTechParamUnitCodeClickHandler(data); break;
+ }
+ })
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
@@ -380,6 +390,13 @@
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
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: 'onTechParamUnitCodeClickHandler', templet: function (d) {
+ return '<span style="color: blue;">' + d.宸ヨ壓鍙傛暟鍒嗙被浠ｇ爜 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
}
else {
switch (data[i].Type) {
@@ -664,12 +681,16 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
+ if (isEmpty(data[0]['瀹℃牳浜�']) === false) {
+ layer.alert('鍒犻櫎澶辫触: 鍗曟嵁宸茶瀹℃牳!', { icon: 5 });
+ return;
+ }
var HItemID = data[0].HItemID.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
- url: GetWEBURL() + "DeltetGy_TechnologyType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/DeltetGy_TechnologyType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
success: function (result) {
if (result.count == 1) {
@@ -994,6 +1015,30 @@
})
}
+ //#region 鑷畾涔変簨浠舵崟鑾�
+ function onTechParamUnitCodeClickHandler(data) {
+ var hID = data.HItemID;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫宸ヨ壓鍙傛暟鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_TechnologyParameterType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery();
+ //location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ //#endregion
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
index d8acdaa..5fe9ac1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
@@ -14,14 +14,25 @@
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<style>
/* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
- .layui-table-cell {
+ /*.layui-table-cell {
overflow: visible !important;
- }
+ }*/
/* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
- td .layui-form-select {
+ /*td .layui-form-select {
margin-top: -10px;
margin-left: -15px;
margin-right: -15px;
+ }*/
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ td:has(select) .layui-table-cell {
+ overflow: visible !important;
+ padding: 0;
+ box-sizing: border-box;
+ }
+
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td:has(select) .layui-form-select {
+ margin-top: -10px;
}
</style>
</head>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index 0b05088..433329e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -38,6 +38,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Checker">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -205,10 +206,9 @@
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
-
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></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>
</div>
</script>
<script type="text/html" id="xuhao">
@@ -228,6 +228,9 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/layui-common-custom.js"></script>
<script>
var OptionData = [];
var Stverf = "";
@@ -258,6 +261,8 @@
, util = layui.util
;
var sBillType = "3913";
+ var HModName= "Sb_EquipDotCheckRuleEdit"
+ var unEditable = ["HManagerName"]
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -281,13 +286,13 @@
Stverf = "Add";
set_AddFNew();
}
- else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
+ else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
Stverf = "Add";
set_EditFromGrid();
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
get_MAXNum();
- OperationType = 1;
+
}
else if (OperationType == 3) {//缂栬緫
Stverf = "Update";
@@ -312,6 +317,11 @@
break;
//澶嶅埗涓�琛�
case 'btn-CopyLine': btnCopyLine(data);
+ break;
+ case 'set_HideColumn': get_HideColumnEditWithCallback(HModName, sessionStorage['HUserName'], option, table, function () {
+ setUneditableCol_WithUneditable(option, unEditable, [])
+ table.render(option)
+ })
break;
}
});
@@ -387,7 +397,7 @@
}
//灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
for (var i = 0; i < checkStatus.data.length; i++) {
- buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": checkStatus.data[i].HDotCheckItemClassID, "HDotCheckItemClassName": checkStatus.data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": 0,"HDotCheckItemMethodName":""});
+ buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": checkStatus.data[i].HDotCheckItemClassID, "HDotCheckItemClassName": checkStatus.data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" });
}
table.reload("mainTable", {
@@ -534,6 +544,7 @@
}
//鍒濆鍖栬〃鍗曟彃浠�
function set_InitFrom() {
+ $("#check-btn").addClass("layui-btn-disabled").attr("disabled", true);
//甯歌鐢ㄦ硶
laydate.render({
elem: '#HDate'
@@ -675,8 +686,8 @@
"HID": linterid
},
success: function (d) {
- if (d.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = d.data.h_v_Sb_EquipDotCheckRuleEdit鎯陈穂0];
+ if (d.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = d.data.h_v_Sb_EquipDotCheckRuleEdit[0];
if (data.榛樿瑙勭▼ == 1) {
$("input[name='HStandard']").prop("checked", true);
}
@@ -684,9 +695,9 @@
$("input[name='HStandard']").prop("checked", false);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": OperationType == 2 ? "" :data.鍗曟嵁鍙�
- , "HInterID": OperationType == 2 ? "" :data.hmainid
- , "HDate": OperationType == 2 ? "" :formatDate(data.鏃ユ湡)
+ "HBillNo": OperationType == 2 ? "" : data.鍗曟嵁鍙�
+ , "HInterID": OperationType == 2 ? "" : data.hmainid
+ , "HDate": OperationType == 2 ? "" : formatDate(data.鏃ユ湡)
, "HBeginDate": formatDate(data.璁″垝寮�濮嬫棩鏈�)
, "HEndDate": formatDate(data.璁″垝缁撴潫鏃ユ湡)
, "HCheckCycle": data.鐐规鍛ㄦ湡
@@ -707,6 +718,26 @@
, "HUSEORGID": data.HUSEORGID
});
+ if (OperationType != 2) {
+ if (isEmpty(data["瀹℃牳浜�"]) === false) {
+ $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
+ } else {
+ $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ } else {
+ $("#HMaker").val(sessionStorage["HUserName"])
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"))
+ $("#HChecker").val("")
+ $("#HCheckDate").val("")
+ $("#HUpDater").val("")
+ $("#HUpDateDate").val("")
+ $("#HCloseMan").val("")
+ $("#HCloseDate").val("")
+ $("#HDeleteMan").val("")
+ $("#HDeleteDate").val("")
+ OperationType = 1;
+ }
+
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -718,7 +749,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sb_EquipDotCheckRuleBill/Sb_EquipDotCheckRuleBillListProjectDetai',
+ url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/Sb_EquipDotCheckRuleBillListProjectDetai',
type: "GET",
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
@@ -729,6 +760,8 @@
rowarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].瀛愬娉�, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
}
option.data = rowarr;
+ DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
+ setUneditableCol_WithUneditable(option, unEditable, [])
table.render(option);
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html"
index 75f98c8..850dda6 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/HideButton_New.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -170,8 +171,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></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_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_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="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_UnDelete" id="btn_UnDelete"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
@@ -305,6 +306,13 @@
};
});
+ //鑷畾涔変簨浠�
+ table.on("tool(mainTable)", function (obj) {
+ let data = obj.data;
+ switch (obj.event) {
+ case "onBillNumberClickHandler": onBillNumberClickHandler(data); break;
+ }
+ })
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -461,6 +469,13 @@
if ($.inArray(data[i].name, titleData) > -1 ) {
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: 'onBillNumberClickHandler', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
else {
switch (data[i].Type) {
//int
@@ -486,7 +501,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 780
+ , height: "full-130"
, page: true
, totalRow: true
, cellMinWidth: 90
@@ -768,9 +783,17 @@
function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
-
+ debugger
if (data.length == 1) {
- layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ if (num == 1 && isEmpty(data[0]["瀹℃牳浜�"]) === false) {
+ layer.alert("瀹℃牳澶辫触: 鍗曟嵁宸茶瀹℃牳!", { icon: 5 })
+ return
+ }
+ else if (num == 2 && isEmpty(data[0]["瀹℃牳浜�"]) === true) {
+ layer.alert("鍙嶅鏍稿け璐�: 鍗曟嵁鏈瀹℃牳!", { icon: 5 })
+ return
+ }
+ layer.confirm("纭瑕�"+ (num == 1 ? "瀹℃牳" : "鍙嶅鏍�") +"鍚�?", function (index) {
var wait = layer.load();
var HInterID = data[0].hmainid;
$.ajax({
@@ -798,38 +821,38 @@
}
//鍏抽棴/鍙嶅叧闂�
- function set_CloseBill(num) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ //function set_CloseBill(num) {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
- if (data.length == 1) {
- layer.confirm("纭瑕佸叧闂悧?", function (index) {
- var wait = layer.load();
- var HInterID = data[0].hmainid;
- $.ajax({
- url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/CloseSb_EquipDotCheckRuleBill',
- type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- get_FastQuery();
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
- })
- }
- else {
- layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
- }
- }
+ // if (data.length == 1) {
+ // layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ // var wait = layer.load();
+ // var HInterID = data[0].hmainid;
+ // $.ajax({
+ // url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/CloseSb_EquipDotCheckRuleBill',
+ // type: "GET",
+ // data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // get_FastQuery();
+ // layer.msg(result.Message, { icon: 1 });
+ // layer.close(wait);
+ // } else {
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // layer.close(wait);
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // layer.close(wait);
+ // }
+ // });
+ // })
+ // }
+ // else {
+ // layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ // }
+ //}
//#region 浣滃簾/鍙嶄綔搴�
function btn_Delete(num) {
@@ -1198,6 +1221,31 @@
})
}
+ //#region 鑷畾涔変簨浠剁洃鍚�
+ function onBillNumberClickHandler(data) {
+ var linterid = data.hmainid;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ }
+ //#endregion
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
index 10d834d..960a205 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
@@ -10,6 +10,9 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
+ <script src="../../../layuiadmin/layui-common-custom.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -26,6 +29,7 @@
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="add-btn">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Check" id="check-btn">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
@@ -229,6 +233,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></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>
</div>
</script>
@@ -237,6 +242,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine1"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine1"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn1" id="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -288,6 +294,10 @@
//鏌ヨ鏉′欢
var option = [];//淇濆吇
var option1 = [];//閰嶄欢
+ var HModName = "Sb_EquipMaintainRuleListSub1";
+ var HModName1 = "Sb_EquipMaintainRuleListSub2";
+ var unEditable = ["HMaintainItem", "HManagerName"]
+ var unEditable1 = ["HMaterName", "HUnitNumber", "HUnitName"]
var sBillType = "3912";
//#endregion
@@ -345,6 +355,11 @@
//澶嶅埗涓�琛�
case 'btn-CopyLine': btnCopyLine(data);
break;
+ case 'set_HideColumn': get_HideColumnEditWithCallback(HModName, sessionStorage["HUserName"], option, table, function () {
+ setUneditableCol_WithUneditable(option, unEditable, [])
+ table.render(option)
+ });
+ break;
}
});
//澶村伐鍏锋爮浜嬩欢
@@ -358,6 +373,10 @@
break;
//澶嶅埗涓�琛�
case 'btn-CopyLine1': btnCopyLine1(data);
+ break;
+ case 'set_HideColumn1': get_HideColumnEditWithCallback(HModName1, sessionStorage["HUserName"], option1, table, function () {
+ table.render(option1)
+ });
break;
}
});
@@ -465,7 +484,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -499,6 +518,7 @@
//#region 姝ら〉闈㈡墍鏈夋柟娉�
//鍒濆鍖栬〃鍗�
function set_InitFrom() {
+ $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true)
laydate.render({
elem: '#HDate',
});
@@ -618,7 +638,7 @@
//缂栬緫鑾峰彇琛ㄥご
function set_EditForm(linterid) {
$.ajax({
- url: GetWEBURL() + "Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillListCheckDetai",
+ url: GetWEBURL() + "/Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillListCheckDetai",
type: "GET",
data: {
"HID": linterid
@@ -658,6 +678,25 @@
, "HUSEORGID": data.HUSEORGID
});
+ if (OperationType != 2) {
+ if (isEmpty(data.瀹℃牳浜�) === false) {
+ $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
+ } else {
+ $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ } else {
+ $("#HMaker").val(sessionStorage["HUserName"])
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"))
+ $("#HChecker").val("")
+ $("#HCheckDate").val("")
+ $("#HUpDater").val("")
+ $("#HUpDateDate").val("")
+ $("#HCloseMan").val("")
+ $("#HCloseDate").val("")
+ $("#HDeleteMan").val("")
+ $("#HDeleteDate").val("")
+ }
+
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -671,14 +710,18 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillSubAndSubItem',
+ url: GetWEBURL() + '/Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillSubAndSubItem',
type: "GET",
data: { "HInterID": linterid },
success: function (result) {
if (result.count == 1) {
option.data = result.list[0];
+ DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
+ setUneditableCol_WithUneditable(option, unEditable, [])
table.render(option);
option1.data = result.list[1];
+ DisPlay_HideColumnEdit(HModName1, sessionStorage["HUserName"], option1, table);
+ setUneditableCol_WithUneditable(option1, unEditable1, [])
table.render(option1);
} else {
@@ -1018,16 +1061,42 @@
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
+ } else if (checkStatus.data.length > 1) {
+ let tableBak = table.cache['mainTable']
+ let tempArr = []
+
+ for (let tableOne of tableBak) {
+ if (isEmpty(tableOne.HItemID, true, true) === false) {
+ tempArr.push(tableOne)
+ }
+ }
+
+ for (let checkOne of checkStatus.data) {
+ tempArr.push({
+ HMaterID: checkOne.HItemID,
+ HMaterNumber: checkOne.鐗╂枡浠ｇ爜,
+ HMaterName: checkOne.鐗╂枡鍚嶇О,
+ HUnitID: checkOne.HUnitID,
+ HUnitNumber: checkOne.璁￠噺鍗曚綅浠ｇ爜,
+ HUnitName: checkOne.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
+ table.reload('mainTable1', {
+ data: tempArr
+ })
+ } else {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMaterID: checkStatus.data[0].HItemID,
+ HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜,
+ HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О,
+ HUnitID: checkStatus.data[0].HUnitID,
+ HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜,
+ HUnitName: checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ });
}
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMaterID: checkStatus.data[0].HItemID,
- HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜,
- HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О,
- HUnitID: checkStatus.data[0].HUnitID,
- HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜,
- HUnitName: checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
- });
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1121,6 +1190,18 @@
function GetMaterValue(obj) {
OptionData = obj;
}
+
+ //閰嶄欢淇℃伅
+ function GetGyMaterial(obj) {
+ OptionData[0] = obj;
+ }
+
+
+ //淇濆吇绾у埆
+ function GetMaintainLevValue(obj) {
+ $("#HMaintainLevName").val(obj[0].淇濆吇绾у埆鍚嶇О);
+ $("#HMaintainLevID").val(obj[0].HItemID);
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
index 9cc5de9..815847f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
@@ -13,6 +13,7 @@
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/HideButton_New.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -32,26 +33,14 @@
<span>鏇村</span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
- </div>
- </div>
+
<!--<div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HCreateBy" id="HCreateBy">
- </div>
- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HCreateBy" id="HCreateBy">
+ </div>
+ </div>-->
+
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
@@ -71,6 +60,12 @@
<input type="date" class="layui-input ForFilteringSchemes" name="EndHCreateDate" id="EndHCreateDate">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
<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>
@@ -79,7 +74,17 @@
<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">
+ <div class="layui-colla-content">
+ <div class="layui-row" style="margin: 5px 0;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -204,6 +209,18 @@
</div>
</script>
+ <script type="text/html" id="toolbarDemo1">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet1">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn1" id="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet2">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2" id="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+
<script type="text/html" id="xuhao">
{{d.LAY_TABLE_INDEX+1}}
</script>
@@ -247,6 +264,8 @@
var option1 = [];
var option2 = [];
var HModName = "Sb_EquipMaintainRuleList";
+ var HModName1 = "Sb_EquipMaintainRuleListSub1";
+ var HModName2 = "Sb_EquipMaintainRuleListSub2";
var ins; //鐢ㄤ簬瀵煎嚭excel
var HBillType = "3912";
@@ -355,6 +374,31 @@
};
});
+ //涓昏〃鑷畾涔変簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ let data = obj.data
+ switch (obj.event) {
+ case "onBillNumberClickHandler": onBillNumberClickHandler(data); break;
+ }
+ })
+
+ //淇濆吇椤逛俊鎭伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable1)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ case "set_HideColumn1": get_HideColumnNoPage(HModName1, sessionStorage['HUserName'], option1, get_FastQuery); break;
+ default: break;
+ }
+ })
+ //閰嶄欢淇℃伅宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable2)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ case "set_HideColumn2": get_HideColumnNoPage(HModName2, sessionStorage['HUserName'], option2, get_FastQuery); break;
+ default: break;
+ }
+ })
+
//鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -377,7 +421,7 @@
var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
var linterid = datas.hmainid;
$.ajax({
- url: GetWEBURL() + 'Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillListProjectDetaiNew',
+ url: GetWEBURL() + '/Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillListProjectDetaiNew',
type: "GET",
data: { "HInterID": linterid },
success: function (data1) {
@@ -521,7 +565,7 @@
var ajaxLoad = layer.load();
option1 = {
elem: '#mainTable1'
- //, toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo1'
, height: '350'
, page: true
, cellMinWidth: 90
@@ -550,7 +594,7 @@
var ajaxLoad = layer.load();
option2 = {
elem: '#mainTable2'
- //, toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, height: '350'
, page: true
, cellMinWidth: 90
@@ -605,6 +649,13 @@
if ($.inArray(data[i].name, titleData) > -1 ) {
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: 'onBillNumberClickHandler', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
else {
switch (data[i].Type) {
//int
@@ -630,7 +681,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: "full-130"
, page: true
, totalRow: true
, cellMinWidth: 90
@@ -644,14 +695,20 @@
//鍒楄缃�
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+ DisPlay_HideColumn(HModName1, sessionStorage["HUserName"], option1, []);
+ table.render(option1)
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
+ table.render(option2)
////鍒锋柊琛ㄦ牸鏁版嵁
ins = table.render(option);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule();//鍔犺浇鏂规
}
+
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
} else {
@@ -790,6 +847,13 @@
, data = checkStatus.data;
if (data.length == 1) {
+ if (num === 1 && isEmpty(data[0]['瀹℃牳浜�']) === false) { // 宸插鏍哥殑鍗曟嵁涓嶈兘鍐嶅鏍�
+ layer.alert('瀹℃牳澶辫触: 鍗曟嵁宸插鏍�', { icon: 5 })
+ return;
+ } else if (num === 2 && isEmpty(data[0]['瀹℃牳浜�']) === true) { // 鏈鏍哥殑鍗曟嵁涓嶈兘鍙嶅鏍�
+ layer.alert('鍙嶅鏍稿け璐�: 鍗曟嵁瀹℃牳', { icon: 5 })
+ return;
+ }
layer.confirm("纭瑕佸鏍稿悧?", function (index) {
var wait = layer.load();
var HInterID = data[0].hmainid;
@@ -1372,6 +1436,31 @@
//#endregion
+ //#region鑷畾涔変簨浠舵崟鑾�
+ function onBillNumberClickHandler(data) {
+ var linterid = data.hmainid;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ get_FastQuery()
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ //#endregion
+
//#endregion
});
--
Gitblit v1.9.1