From 9e23ca1777dd20f58693dfe361da151e9ef4fe0f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 13:50:32 +0800
Subject: [PATCH] fix: 修正设备工艺参数订单点检表 历史记录不存在数据时，会显示一条空数据的问题
---
WebTM/WebTM.csproj.user | 2
WebTM/layuiadmin/common.js | 47 +
WebTM/views/基础资料/基础资料/Gy_PatrolCheckEdit.html | 18
WebTM/views/模治具管理/模治具管理/Sc_MouldConkBookBillList.html | 279 +++++-
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit_HistoryRecord.html | 8
WebTM/views/基础资料/基础资料/Gy_PatrolCheckItemClassList.html | 93 +
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 329 +++++-
WebTM/layuiadmin/SetColumn.js | 4
WebTM/views/基础资料/基础资料/Gy_PatrolCheckItemMethodEdit.html | 188 ++++
WebTM/views/基础资料/基础资料/Gy_PatrolCheckList.html | 133 ++
WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckBillList.html | 154 ++
WebTM/views/基础资料/基础资料/Gy_DotCheckItemMethodList.html | 2
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 268 ++++-
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainBillList.html | 290 +++--
WebTM/views/基础资料/基础资料/Gy_PatrolCheckItemClassEdit.html | 185 +++
WebTM/views/基础资料/基础资料/Gy_PatrolCheckItemMethodList.html | 352 +++++++
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 2
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html | 253 ++++-
19 files changed, 2,101 insertions(+), 508 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 2f7c57c..cbf1153 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 8ca34d8..ca3bde2 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -31,7 +31,7 @@
//var WEBURL = "http://192.168.60.12/API"; //涓帶
//var WEBURL = "http://192.168.6.5:8082/API/"; //鑸滄垚
/*var WEBURL = "http://121.36.199.126:8181/API/"; //涓夊崌*/
- //var WEBURL = "http://localhost:81/API";
+ var WEBURL = "http://localhost:81/API";
return WEBURL
}
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 07aa196..2f27e57 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -304,7 +304,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
- if(_newCols !== undefined) {
+ if (_newCols !== undefined) {
callback.call([option]);
}
}
@@ -476,7 +476,7 @@
}
}
table.render(option);
-
+
} else {
}
}, error: function () {
diff --git a/WebTM/layuiadmin/common.js b/WebTM/layuiadmin/common.js
index f4f6ddd..9f2826b 100644
--- a/WebTM/layuiadmin/common.js
+++ b/WebTM/layuiadmin/common.js
@@ -20,8 +20,53 @@
}, delay);
// 閰嶇疆绔嬪嵆鎵ц
- if(callNow) {
+ if(callNow == true) {
func.apply(context, args)
}
};
+}
+
+// 鍒ょ┖鍑芥暟
+function isEmpty(val, zeroIsEmpty = false, falseIsEmpty = false){
+ // 妫�鏌ユ槸鍚︿负null 鎴栬�� undefind
+ if(val === null || val === undefined){
+ return true;
+ }
+
+ // 鏄惁鏄瓧绗︿覆绫诲瀷
+ if(typeof val === 'string') {
+ return val.trim().length === 0;
+ }
+
+ // 鏄惁鏄暟缁�
+ if(Array.isArray(val)) {
+ return val.length === 0;
+ }
+
+ //鏄惁鏄璞�
+ if(typeof val === 'object') {
+ return Object.keys(val).length === 0;
+ }
+
+ // 鏁板瓧绫诲瀷榛樿涓嶄负绌�
+ if(typeof val === 'number'){
+ // 鏁板瓧涓�0瑙嗕负绌�
+ if(zeroIsEmpty == true){
+ if(val === 0){
+ return true
+ }
+ }
+ return false
+ }
+
+ // 甯冨皵绫诲瀷榛樿涓嶄负绌�
+ if (typeof val === 'boolean') {
+ // false鍊艰涓虹┖
+ if(falseIsEmpty == true){
+ if(val === 0){
+ return true
+ }
+ }
+ return false;
+ }
}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html"
index 8329fe9..b6fec27 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html"
@@ -257,7 +257,7 @@
var index = parent.layer.getFrameIndex(window.name);
var data = obj.data;
//杩斿洖鏂规硶
- parent.GetDotCheckListValue(data);
+ parent.GetDotCheckItemMethodListValue(data);
parent.layer.close(index);
})
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckEdit.html"
index 4640d93..b962250 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckEdit.html"
@@ -15,6 +15,7 @@
<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>
<style media="screen">
.custom-tree-item-clicked {
color: #FC9003
@@ -37,7 +38,7 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- <li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -79,7 +80,7 @@
<label class="layui-form-label" style="width: 85px;">浣跨敤缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <select disabled name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
@@ -87,7 +88,7 @@
<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="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+ <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
<option value="鏈娇鐢�" selected="selected">鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
<option value="鏈娴�">鏈娴�</option>
@@ -238,8 +239,12 @@
$("#HCheckTime").val("");
$("#HNumber").val("");
$("#HItemID").val(0);
+
} else if (OperationType == 3) {
RoadBillMain(linterid);
+ if(isEmpty($('#HCheckEmp').val()) == false) {
+ $("#add-btn").addClass('layui-btn-disabled').attr("disabled", true);
+ }
}
//#region 宸ュ叿鎸夐挳
@@ -338,7 +343,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_PatrolCheckItemClassList.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_PatrolCheckItemClassList.html?openType=2', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -425,6 +430,11 @@
}
});
+
+ function GetPatrolCheckListValue(data) {
+ $('#HPatrolCheckItemClassName').val(data.宸℃椤圭洰鍒嗙被鍚嶇О)
+ $("#HPatrolCheckItemClassID").val(data.HItemID);
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemClassEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemClassEdit.html"
index 67fad7a..836d285 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemClassEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemClassEdit.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鏂板/缂栬緫宸℃椤圭洰鍒嗙被</title>
@@ -15,12 +16,16 @@
<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/zgqCustom/zgqCustom.js"></script>
+
<style media="screen">
.custom-tree-item-clicked {
color: #FC9003
}
</style>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
@@ -30,47 +35,141 @@
<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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <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>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
+ <h1 style="text-align: center; padding: 10px 0;"><b>宸℃椤圭洰鍒嗙被</b></h1>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">浠ｇ爜</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber"
+ id="HNumber">
<input id="HItemID" name="HItemID" type="hidden" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍚嶇О</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+ <input class="layui-input" name="HName" lay-verify="HName"
+ id="HName">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍔╄鐮�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+ <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode"
+ id="HHelpCode">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark"
+ id="HRemark"></textarea>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">绂佺敤鏍囧織</label>
<div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+ <input type="checkbox" name="HStopflag" id="HStopflag" disabled
+ lay-skin="primary" title="">
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <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" name="HMaker" id="HMaker"
+ style="background-color:#efefef4d;" readonly>
+ </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" name="HChecker" id="HChecker"
+ style="background-color:#efefef4d;" readonly>
+ </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" name="HCloseMan"
+ id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </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" name="HUpDater" id="HUpDater"
+ style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-form-item">
+ <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" name="HMakeDate"
+ id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </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" name="HCheckDate"
+ id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </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" name="HCloseDate"
+ id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </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" name="HUpDateDate"
+ id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <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" name="HDeleteMan"
+ id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </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" name="HDeleteDate"
+ id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
</div>
@@ -101,7 +200,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'util'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
@@ -110,11 +209,14 @@
, table = layui.table
, form = layui.form
, laydate = layui.laydate
- , element = layui.element;
+ , element = layui.element
+ , util = layui.util;
//#endregion
//甯歌鐢ㄦ硶
- if(OperationType == 2){
+ $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ $('#Maker').val(sessionStorage['Maker'])
+ if (OperationType == 2) {
$.ajax({
url: GetWEBURL() + "/Gy_PatrolCheckItemClass/EditPatrolCheckItemClass",
type: "GET",
@@ -131,11 +233,11 @@
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
- linterid = 0
+ linterid = 0
}
});
}
- if (OperationType == 3) {
+ else if (OperationType == 3) {
$.ajax({
url: GetWEBURL() + "/Gy_PatrolCheckItemClass/EditPatrolCheckItemClass",
type: "GET",
@@ -151,17 +253,33 @@
$("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == 'Y' ? true : false);//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+ debugger
+ if (isEmpty(d.data[0].瀹℃牳浜�) == true) {
+ $('#check-btn').removeClass('layui-btn-disabled').attr('disabled', false)
+ }
+ if (isEmpty(d.data[0].瀹℃牳浜�) == false) {
+ $('#add-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ }
+ $("#HMaker").val(d.data[0].鍒涘缓浜�)
+ $("#HMakeDate").val(isEmpty(d.data[0].鍒涘缓鏃ユ湡) == true ? "" : util.toDateString(d.data[0].鍒涘缓鏃ユ湡, "yyyy-MM-dd"))
+ $("#HChecker").val(d.data[0].瀹℃牳浜�)
+ $("#HCheckDate").val(isEmpty(d.data[0].瀹℃牳鏃ユ湡) == true ? "" : util.toDateString(d.data[0].瀹℃牳鏃ユ湡, "yyyy-MM-dd"))
+ $("#HUpDater").val(d.data[0].淇敼浜�)
+ $("#HUpDateDate").val(isEmpty(d.data[0].淇敼鏃ユ湡) == true ? "" : util.toDateString(d.data[0].淇敼鏃ユ湡, "yyyy-MM-dd"))
+ $("#HCloseMan").val(d.data[0].鍏抽棴浜�)
+ $("#HCloseDate").val(isEmpty(d.data[0].鍏抽棴鏃ユ湡) == true ? "" : util.toDateString(d.data[0].鍏抽棴鏃ユ湡, "yyyy-MM-dd"))
+ $("#HDeleteMan").val(d.data[0].浣滃簾浜�)
+ $("#HDeleteDate").val(isEmpty(d.data[0].浣滃簾鏃ユ湡) == true ? "" : util.toDateString(d.data[0].浣滃簾鏃ユ湡, "yyyy-MM-dd"))
+ $('#HStopFlag').attr('checked', !isEmpty(d.data[0].绂佺敤鏍囪))
}
});
}
-
//#region 宸ュ叿鎸夐挳
-
+
//閫�鍑烘寜閽�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
})
-
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
@@ -169,11 +287,11 @@
var isEndCheck = document.getElementById("HStopflag").checked;
data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
- data.field.HItemID = linterid == "" ? 0 : linterid;
+ data.field.HItemID = linterid == "" ? 0 : linterid;
var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + user + ';' + sessionStorage["OrganizationID"] + ';' + OperationType ;
+ var sMainSub = oMain + ';' + user + ';' + sessionStorage["OrganizationID"] + ';' + OperationType;
$.ajax({
type: "POST",
@@ -200,15 +318,42 @@
});
});
+ // 瀹℃牳
+ form.on('submit(Checker)', function (data) {
+
+ var InterID = linterid
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_PatrolCheckItemClass/AuditGy_PatrolCheckItemClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ $("#check-btn").addClass("layui-btn-disabled").attr('disabled', true)
+ $("#add-btn").addClass("layui-btn-disabled").attr('disabled', true)
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
//#endregion
-
-
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
-
}
});
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemClassList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemClassList.html"
index f475c06..61d2fd0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemClassList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemClassList.html"
@@ -19,6 +19,7 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/HideButton_New.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
<style media="screen">
.custom-tree-item-clicked {
color: #FC9003
@@ -51,6 +52,16 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input ForFilteringSchemes" name="HName"
id="HName">
+ </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>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
@@ -230,7 +241,7 @@
var sWhere = "";
var option = [];
var HModName = "Gy_PatrolCheckItemClassList";
- var HBillType= 'Gy_PatrolCheckItemClassList'
+ var HBillType = 'Gy_PatrolCheckItemClassList'
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID"];
//#endregion
@@ -383,6 +394,8 @@
//鍒濆鍖栬〃鏍�
function set_ClearBill() {
+ //鍒濆鍖栫粍缁�
+ Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -392,6 +405,29 @@
get_Display_Tree()
get_DefaultModule();
+ }
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
}
//#region鍒濆鍖栬〃鏍�
@@ -443,17 +479,17 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
- if (data[i].name === '宸℃椤圭洰鍒嗙被浠ｇ爜') {
- col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
- templet: function (d) {
- return '<span style="color: blue;" lay-unrow >' + d.宸℃椤圭洰鍒嗙被浠ｇ爜 + '</span>'
- }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
- });
- }
- else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
+ // if (data[i].name === '宸℃椤圭洰鍒嗙被浠ｇ爜') {
+ // col.push({
+ // field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+ // templet: function (d) {
+ // return '<span style="color: blue;" lay-unrow >' + d.宸℃椤圭洰鍒嗙被浠ｇ爜 + '</span>'
+ // }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
+ // });
+ // }
+ // else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ // }
}
}
}
@@ -477,7 +513,7 @@
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -696,6 +732,10 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
+ if (isEmpty(data[0].瀹℃牳浜�) === false) {
+ layer.alert("宸茶瀹℃牳鐨勬暟鎹笉鑳借鍒犻櫎!!!", { icon: 5 })
+ return
+ }
if (checkStatus.data.length === 1) {
layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
btn: ['纭畾', '鍙栨秷'] //鎸夐挳
@@ -861,6 +901,8 @@
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
+ } else {
+ option.cols[0][i + 1]["hide"] = false;
}
//璁剧疆鍒楀
if (dataCols[3] > 0) {
@@ -894,7 +936,29 @@
option.cols[0][i + 1]["align"] = "right";
break;
}
+ option.cols[0][i + 1].title = dataCols[4]
+ option.cols[0][i + 1].field = dataCols[5]
+ delete option.cols[0][i + 1].templet
+ // 閲嶆柊鍒ゅ畾鏃ユ湡鍒� 鍜� 闇�瑕佽秴閾炬帴鐨勫垪
+ if (option.cols[0][i + 1].field.search(/鏃ユ湡|鏃堕棿|time|date/i) !== -1) {
+
+ option.cols[0][i + 1].templet = [
+ '<div>{{ d.',
+ option.cols[0][i + 1].field,
+ ' == null ? \'\' : layui.util.toDateString(d.',
+ option.cols[0][i + 1].field,
+ ', \'yyyy-MM-dd HH:mm:ss\') }}</div>'
+ ].join('');
+ } else if (option.cols[0][i + 1].field === '宸℃椤圭洰鍒嗙被浠ｇ爜') {
+ option.cols[0][i + 1].templet = function (d) {
+ return '<span style="color: blue;" lay-unrow >' + d.宸℃椤圭洰鍒嗙被浠ｇ爜 + '</span>'
+ }
+ option.cols[0][i + 1].style = 'cursor: pointer;'
+ option.cols[0][i + 1].event = 'onHBillNumberClickHandler'
+ }
}
+
+
//鍙栨秷鍐荤粨鍒�
for (var i = 1; i < option.cols[0].length - 1; i++) {
@@ -914,6 +978,7 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ debugger
table.render(option);
} else {
table.render(option);
@@ -963,7 +1028,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var addSWhere = "";
if (typeof (openType) != "undefined") {
- addSWhere = " and 绂佺敤浜� = '' and 瀹℃牳浜� != ''";
+ addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� != ''";
}
return addSWhere;
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemMethodEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemMethodEdit.html"
index 75be51c..f61ee70 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemMethodEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemMethodEdit.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鏂板/缂栬緫宸℃鏂规硶</title>
@@ -15,12 +16,14 @@
<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>
<style media="screen">
.custom-tree-item-clicked {
color: #FC9003
}
</style>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
@@ -30,47 +33,141 @@
<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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <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>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
+ <h1 style="text-align: center; padding: 10px 0;"><b>宸℃鏂规硶</b></h1>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">浠ｇ爜</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber"
+ id="HNumber">
<input id="HItemID" name="HItemID" type="hidden" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍚嶇О</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+ <input class="layui-input" name="HName" lay-verify="HName"
+ id="HName">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍔╄鐮�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+ <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode"
+ id="HHelpCode">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark"
+ id="HRemark"></textarea>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">绂佺敤鏍囧織</label>
<div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+ <input type="checkbox" name="HStopflag" id="HStopflag" disabled
+ lay-skin="primary" title="">
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <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" name="HMaker" id="HMaker"
+ style="background-color:#efefef4d;" readonly>
+ </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" name="HChecker" id="HChecker"
+ style="background-color:#efefef4d;" readonly>
+ </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" name="HCloseMan"
+ id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </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" name="HUpDater" id="HUpDater"
+ style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-form-item">
+ <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" name="HMakeDate"
+ id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </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" name="HCheckDate"
+ id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </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" name="HCloseDate"
+ id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </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" name="HUpDateDate"
+ id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <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" name="HDeleteMan"
+ id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </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" name="HDeleteDate"
+ id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
</div>
@@ -101,7 +198,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'util'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
@@ -110,11 +207,13 @@
, table = layui.table
, form = layui.form
, laydate = layui.laydate
- , element = layui.element;
+ , element = layui.element
+ , util = layui.util;
//#endregion
//甯歌鐢ㄦ硶
-
+ $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ $("#HMaker").val(sessionStorage['HMaker'])
if (OperationType == 3) {
$.ajax({
url: GetWEBURL() + "/Gy_PatrolCheckItemMethod/EditPatrolCheckItemMethod",
@@ -131,12 +230,51 @@
$("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == 'Y' ? true : false);//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+ $("#HMaker").val(d.data[0].鍒涘缓浜�)
+ $("#HMakeDate").val(isEmpty(d.data[0].鍒涘缓鏃ユ湡) == true ? "" : util.toDateString(d.data[0].鍒涘缓鏃ユ湡, "yyyy-MM-dd"))
+ $("#HChecker").val(d.data[0].瀹℃牳浜�)
+ $("#HCheckDate").val(isEmpty(d.data[0].瀹℃牳鏃ユ湡) == true ? "" : util.toDateString(d.data[0].瀹℃牳鏃ユ湡, "yyyy-MM-dd"))
+ $("#HUpDater").val(d.data[0].淇敼浜�)
+ $("#HUpDateDate").val(isEmpty(d.data[0].淇敼鏃ユ湡) == true ? "" : util.toDateString(d.data[0].淇敼鏃ユ湡, "yyyy-MM-dd"))
+ $("#HCloseMan").val(d.data[0].鍏抽棴浜�)
+ $("#HCloseDate").val(isEmpty(d.data[0].鍏抽棴鏃ユ湡) == true ? "" : util.toDateString(d.data[0].鍏抽棴鏃ユ湡, "yyyy-MM-dd"))
+ $("#HDeleteMan").val(d.data[0].浣滃簾浜�)
+ $("#HDeleteDate").val(isEmpty(d.data[0].浣滃簾鏃ユ湡) == true ? "" : util.toDateString(d.data[0].浣滃簾鏃ユ湡, "yyyy-MM-dd"))
+ $('#HStopFlag').attr('checked', !isEmpty(d.data[0].绂佺敤鏍囪))
+ if (isEmpty(d.data[0].瀹℃牳浜�) == true) {
+ $('#check-btn').removeClass('layui-btn-disabled').attr('disabled', false)
+ }
+ if (isEmpty(d.data[0].瀹℃牳浜�) == false) {
+ $('#add-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ }
}
});
+ } else if (OperationType == 2) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_PatrolCheckItemMethod/EditPatrolCheckItemMethod",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (d) {
+ ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+ $("#HNumber").val(d.data[0].宸℃鏂规硶浠ｇ爜);
+ $("#HName").val(d.data[0].宸℃鏂规硶鍚嶇О);
+ $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+ $("#HRemark").val(d.data[0].澶囨敞);
+ // $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == 'Y' ? true : false);//true:閫変腑 false:涓嶉�変腑
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ // $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+
+
+ linterid = 0
+ }
+ });
+
}
//#region 宸ュ叿鎸夐挳
-
+
//閫�鍑烘寜閽�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
@@ -182,6 +320,33 @@
//#endregion
+ //瀹℃牳
+ form.on('submit(Checker)', function (data) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_PatrolCheckItemMethod/AuditGy_PatrolCheckItemMethod", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": linterid, "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ $('#add-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -191,4 +356,5 @@
});
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemMethodList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemMethodList.html"
index b5cd346..7db9f6e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemMethodList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemMethodList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>宸℃鏂规硶鍒楄〃</title>
@@ -14,13 +15,16 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
<style media="screen">
.custom-tree-item-clicked {
color: #FC9003
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -37,41 +41,62 @@
<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="HNumber" id="HNumber">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber"
+ id="HNumber">
</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="HName" id="HName">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName"
+ id="HName">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+
+ <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>
+ <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">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 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:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName" id="ColName" lay-filter="ColName"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator"
+ style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -79,7 +104,76 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1"
+ style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2"
+ style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -87,15 +181,19 @@
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -132,6 +230,8 @@
var sWhere = "";
var option = [];
var HModName = "Gy_PatrolCheckItemMethodList";
+ var HBillType = 'Gy_PatrolCheckItemMethodList'
+ var set_HideButton_ID = "toolbarDemo_ButtonSet"
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID"];
//#endregion
@@ -156,7 +256,6 @@
//#region 澶村伐鍏锋爮浜嬩欢
-
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鏂板
@@ -167,6 +266,10 @@
break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
+ break;
+ //澶嶅埗
+ case 'btn_Copy':
+ set_copy();
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
@@ -186,6 +289,14 @@
case 'btn-DeAudit':
set_CheckBill(2);
break;
+ //绂佺敤鎸夐挳
+ case 'btn-Stop':
+ set_De_Stop(0);
+ break;
+ //鍙嶇鐢ㄦ寜閽�
+ case 'btn-DeStop':
+ set_De_Stop(1);
+ break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
@@ -198,8 +309,19 @@
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
};
});
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ switch (obj.event) {
+ case 'onHNumberClickHandler': onHNumberClickHandler(data); break;
+ }
+ })
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -259,6 +381,7 @@
//鍒濆鍖栬〃鏍�
function set_ClearBill() {
+ Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -267,6 +390,30 @@
get_DefaultModule();
}
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -277,7 +424,7 @@
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
- , cellMinWidth: 90
+ , cellMinWidth: 90
};
}
//鏌ヨ
@@ -365,6 +512,12 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -387,6 +540,51 @@
}
sWhere += " and " + ColName + " " + com;
}
+
+
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+
if (HNumber) {
sWhere += " and 宸℃鏂规硶浠ｇ爜 like '%" + HNumber + "%'";
}
@@ -405,6 +603,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
form.render('select');
sWhere = "";
@@ -482,6 +686,10 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
+ if(isEmpty(data[0].瀹℃牳浜�) == false) {
+ layer.alert("宸插鏍哥殑鏁版嵁涓嶈兘琚垹闄�!", {icon: 5})
+ return
+ }
if (checkStatus.data.length === 1) {
layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
btn: ['纭畾', '鍙栨秷'] //鎸夐挳
@@ -512,9 +720,75 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
};
+
+ //澶嶅埗
+ function set_copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗宸℃鏂规硶'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_PatrolCheckItemMethodEdit.html?OperationType=2&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鍒讹紒');
+ }
+ }
+
+ //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+ function set_De_Stop(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_PatrolCheckItemMethod/StopGy_PatrolCheckItemMethod", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsStop": 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('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
//鍒锋柊
function get_Refresh() {
@@ -658,6 +932,27 @@
option.cols[0][i + 1]["align"] = "right";
break;
}
+
+ option.cols[0][i + 1].title = dataCols[4]
+ option.cols[0][i + 1].field = dataCols[5]
+ delete option.cols[0][i + 1].templet
+ // 閲嶆柊鍒ゅ畾鏃ユ湡鍒� 鍜� 闇�瑕佽秴閾炬帴鐨勫垪
+ if (option.cols[0][i + 1].field.search(/鏃ユ湡|鏃堕棿|time|date/i) !== -1) {
+
+ option.cols[0][i + 1].templet = [
+ '<div>{{ d.',
+ option.cols[0][i + 1].field,
+ ' == null ? \'\' : layui.util.toDateString(d.',
+ option.cols[0][i + 1].field,
+ ', \'yyyy-MM-dd HH:mm:ss\') }}</div>'
+ ].join('');
+ } else if (option.cols[0][i + 1].field === '宸℃鏂规硶浠ｇ爜') {
+ option.cols[0][i + 1].templet = function (d) {
+ return '<span style="color: blue;" lay-unrow >' + d.宸℃鏂规硶浠ｇ爜 + '</span>'
+ }
+ option.cols[0][i + 1].style = 'cursor: pointer;'
+ option.cols[0][i + 1].event = 'onHNumberClickHandler'
+ }
}
//鍙栨秷鍐荤粨鍒�
@@ -699,6 +994,10 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
@@ -934,6 +1233,28 @@
})
}
+ function onHNumberClickHandler(data) {
+ var hID = data.HItemID
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫宸℃鏂规硶'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_PatrolCheckItemMethodEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
@@ -977,4 +1298,5 @@
//#endregion
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckList.html"
index f2c990c..39e7dc3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>宸℃椤圭洰鍒楄〃</title>
@@ -18,9 +19,10 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/HideButton_New.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
<style>
/*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
- .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ .layui-tree-set-active>.layui-tree-entry .layui-tree-main {
background: #aef0f7;
}
</style>
@@ -30,6 +32,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -46,49 +49,61 @@
<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="HNumber" id="HNumber">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber"
+ id="HNumber">
</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="HName" id="HName">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName"
+ id="HName">
</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="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+ <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes"
+ lay-verify="HUSEORGID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" 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">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 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:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName" id="ColName" lay-filter="ColName"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator"
+ style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -96,26 +111,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -123,26 +145,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -150,7 +179,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -332,6 +362,14 @@
});
//#endregion
+ //琛ㄦ牸鑷畾涔変簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ let data = obj.data;
+ switch (obj.event) {
+ case 'onHBillNumberClickHandler': onHBillNumberClickHandler(data); break;
+ }
+ })
+
//鍙屽嚮琛ㄦ牸浜嬩欢
table.on('rowDouble(mainTable)', function (obj) {
var index = parent.layer.getFrameIndex(window.name);
@@ -374,6 +412,29 @@
get_Display_Tree();
get_DefaultModule();
+ }
+
+ // 鐐瑰嚮瓒呴摼鎺ヨ烦杞�
+ function onHBillNumberClickHandler(data) {
+ var hID = data.HItemID
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫宸℃椤圭洰'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_PatrolCheckEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
}
//#region鍒濆鍖栬〃鏍�
@@ -436,7 +497,17 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ if (data[i].name === '宸℃椤圭洰浠ｇ爜') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+ templet: function (d) {
+ return '<span style="color: blue;" lay-unrow >' + d.宸℃椤圭洰浠ｇ爜 + '</span>'
+ }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
+ });
+ }
+ else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
}
}
}
@@ -456,7 +527,6 @@
ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
-
table.render(option);
layer.close(ajaxLoad);
@@ -559,7 +629,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
-
+
if (HNumber) {
sWhere += " and 宸℃椤圭洰浠ｇ爜 like '%" + HNumber + "%'";
}
@@ -671,6 +741,10 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
+ if (isEmpty(data[0].瀹℃牳浜�) == false) {
+ layer.alert("涓嶈兘鍒犻櫎宸茶瀹℃牳鐨勬暟鎹�!", { icon: 5 })
+ return
+ }
if (checkStatus.data.length === 1) {
layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
btn: ['纭畾', '鍙栨秷'] //鎸夐挳
@@ -1109,7 +1183,7 @@
HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
HValue = HValue.substring(0, HValue.length - 1);
HElement_type = HElement_type.substring(0, HElement_type.length - 1);
-
+ debugger
var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
//淇敼
@@ -1225,4 +1299,5 @@
//#endregion
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html"
index 3a4fbdc..9b0f195 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html"
@@ -1,19 +1,23 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
<title>鏂板/缂栬緫鍣ㄥ叿鏁呴殰鐧昏鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
}
</style>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
@@ -23,8 +27,10 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Exit">閫�鍑�</button>
</div>
</div>
<div class="layui-card-body">
@@ -40,52 +46,82 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo"
+ id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HDate" id="HDate"
+ autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
<div class="layui-input-inline">
- <input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
+ <input type="text" name="HInnerBillNo" id="HInnerBillNo"
+ class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HName" id="HName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductModulList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HName" id="HName" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldID" id="HMouldID"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="ProductModulList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
+ </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>
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鏁呴殰绫诲埆<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鏁呴殰绫诲埆<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HConkTypeName" id="HConkTypeName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HConkTypeList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HConkTypeName" id="HConkTypeName"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HConkTypeID" id="HConkTypeID"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HConkTypeList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戠幇浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍙戠幇浜�<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
@@ -93,48 +129,62 @@
<div class="layui-inline">
<label class="layui-form-label">鏁呴殰鍙戠敓鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HConkBeginDate" id="HConkBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
+ <input class="layui-input" name="HConkBeginDate" id="HConkBeginDate"
+ autocomplete="off" timeFormat="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瑕佹眰瀹屽杽鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" timeFormat="yyyy-MM-dd">
+ <input class="layui-input" name="HEndDate" id="HEndDate"
+ autocomplete="off" timeFormat="yyyy-MM-dd">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HManagerName" id="HManagerName"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HManagerID" id="HManagerID"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浣跨敤閮ㄩ棬<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浣跨敤閮ㄩ棬<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HDeptName" id="HDeptName"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏁呴殰鎻忚堪</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ晠闅滄弿杩�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ <textarea placeholder="璇疯緭鍏ユ晠闅滄弿杩�" class="layui-textarea"
+ name="HExplanation" id="HExplanation"></textarea>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark"
+ id="HRemark"></textarea>
</div>
</div>
</div>
@@ -145,25 +195,29 @@
<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" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMaker" id="HMaker"
+ style="background-color:#efefef4d;" readonly>
</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" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HChecker" id="HChecker"
+ style="background-color:#efefef4d;" readonly>
</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" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCloseMan"
+ id="HCloseMan" style="background-color:#efefef4d;" readonly>
</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" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -172,25 +226,29 @@
<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" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMakeDate"
+ id="HMakeDate" style="background-color:#efefef4d;" readonly>
</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" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCheckDate"
+ id="HCheckDate" style="background-color:#efefef4d;" readonly>
</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" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCloseDate"
+ id="HCloseDate" style="background-color:#efefef4d;" readonly>
</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" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpDateDate"
+ id="HUpDateDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -198,13 +256,15 @@
<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" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HDeleteMan"
+ id="HDeleteMan" style="background-color:#efefef4d;" readonly>
</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" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HDeleteDate"
+ id="HDeleteDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -216,10 +276,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">
@@ -232,7 +291,7 @@
</div>
<script type="text/html" id="barDemo">
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -244,6 +303,7 @@
<script>
//鑾峰彇鍙傛暟
var params = get_UrlVars();
+ var optionData = []
if (typeof (params[params[0]]) == "undefined") {
var OperationType = 1;//鎿嶄綔绫诲瀷
} else {
@@ -268,6 +328,8 @@
, laydate = layui.laydate
, element = layui.element;
var sBillType = "3807";
+ var HModName = "Sc_Add_MouldConkBookBillList";
+ var option = []
//var TabRow = { "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": "", "HConkExplanation": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
//#endregion
@@ -289,6 +351,12 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
+ }
+ else if (OperationType == 2) {//澶嶅埗 鍗犵敤鐨勬湁婧愬崟鏂板鐨凮perationType
+ set_EditFromGrid();
+
+ // 澶嶅埗鏃惰缃� linterid涓�0 鏃ユ湡涓烘渶鏂版棩鏈燂紝鐢宠鏂扮殑鍗曟嵁鍙凤紝鍏朵粬涓嶅彉
+ get_MAXNum();
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid();
@@ -314,6 +382,9 @@
break;
//澶嶅埗涓�琛�
case 'btn-CopyLine': set_CopyLine(data);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, set_EditFromGrid);
break;
}
});
@@ -376,14 +447,14 @@
content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkType.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
-
+ debugger
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HConkTypeName").val(checkStatus.data[0].鏁呴殰绫诲埆);
+ $("#HConkTypeName").val(checkStatus.data[0].鏁呴殰绫诲埆鍚嶇О);
$("#HConkTypeID").val(checkStatus.data[0].hitemid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -571,6 +642,8 @@
//鍒濆鍖栬〃鍗曟彃浠�
function set_InitFrom() {
+ //鍒濆鍖栫粍缁�
+ Organ();
laydate.render({
elem: '#HDate'
@@ -586,17 +659,18 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
+ let hiddenStyle = 'background-color: #eeeeee;'
//琛ㄥご
columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { templet: '#xuhao', title: '搴忓彿', style: hiddenStyle, sort: true, fixed: 'left', event: "qwe" }
, { field: 'HConkReasonID', title: 'HConkReasonID', edit: 'text', hide: true }
, { field: 'HConkReasonCode', title: '鏁呴殰鍘熷洜浠ｇ爜', edit: 'text', event: "HConkReasonCode" }
- , { field: 'HConkReasonName', title: '鏁呴殰鍘熷洜', edit: 'text' }
+ , { field: 'HConkReasonName', title: '鏁呴殰鍘熷洜', style: hiddenStyle }
, { field: 'HConkExplanation', title: '鏁呴殰鍘熷洜鎻忚堪', edit: 'text' }
, { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
, { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
- , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+ , { field: 'HManagerName', title: '璐熻矗浜�', style: hiddenStyle }
, { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -638,9 +712,25 @@
$("#HConkBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HInterID").val(0);
+ if (OperationType == 2) {
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMakeDate": Format(new Date(), "yyyy-MM-dd")
+ , "HMaker": sessionStorage['HMaker']
+ , "HChecker": ''
+ , "HCheckDate": ''
+ , "HUpDater": ''
+ , "HUpDateDate": ''
+ , "HCloseMan": ''
+ , "HCloseDate": ''
+ , "HDeleteMan": ''
+ , "HDeleteDate": ''
+ });
+ }
}
});
}
+
+
//缂栬緫
function set_EditFromGrid() {
@@ -654,7 +744,7 @@
function set_EditForm(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
- url: GetWEBURL() + "Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
+ url: GetWEBURL() + "/Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
type: "GET",
data: {
"HID": linterid
@@ -719,7 +809,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sc_MouldConkBookBill/Sb_MouldConkBookBillListProjectDetai',
+ url: GetWEBURL() + '/Sc_MouldConkBookBill/Sb_MouldConkBookBillListProjectDetai',
type: "GET",
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
@@ -798,7 +888,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (optionData.length > 0) {
+ obj.update({
+ HConkReasonID: optionData[0].hitemid,
+ HConkReasonCode: optionData[0].鏁呴殰鍘熷洜浠ｇ爜,
+ HConkReasonName: optionData[0].鏁呴殰鍘熷洜,
+ });
+ optionData = []
+ }
}
});
}
@@ -839,7 +937,14 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
+ if (optionData.length > 0) {
+ obj.update({
+ HManagerID: optionData[0].HItemID,
+ HManagerCode: optionData[0].鑱屽憳浠ｇ爜,
+ HManagerName: optionData[0].鑱屽憳鍚嶇О
+ });
+ optionData = []
+ }
}
});
}
@@ -880,6 +985,29 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
//layer.alert(copyrow);
}
+ }
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
}
//#endregion
@@ -942,13 +1070,14 @@
}
}
+ //#region 鍙屽嚮杩斿洖鍥炶皟鍑芥暟
function GetMouldFileValue(obj) { //鍣ㄥ叿妗ｆ
$("#HName").val(obj[0].妯″叿鍚嶇О);
$("#HMouldID").val(obj[0].hmainid);
}
function GetConkTypeValue(obj) { //鏁呴殰绫诲埆
- $("#HConkTypeName").val(obj[0].鏁呴殰绫诲埆);
+ $("#HConkTypeName").val(obj[0].鏁呴殰绫诲埆鍚嶇О);
$("#HConkTypeID").val(obj[0].hitemid);
}
@@ -966,6 +1095,16 @@
$("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
+
+ function GetGy_ConkReasonListValue(obj) {
+ optionData = obj
+ }
+
+ function GetHManagerValue(obj) {
+ optionData = obj
+ }
+ //#endregion
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index 2cf9722..53970f0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
@@ -1,21 +1,25 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
<title>鏂板/缂栬緫鍣ㄥ叿鐐规璁板綍琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<style type="text/css">
.layui-form-label {
width: 85px;
}
+
/* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
.layui-table-cell {
overflow: visible !important;
}
+
/* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
td .layui-form-select {
margin-top: -10px;
@@ -24,6 +28,7 @@
}
</style>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
@@ -32,11 +37,18 @@
<form id="component-form-group" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<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" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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>
+ <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" 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="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>
</div>
</div>
<div class="layui-card-body">
@@ -53,29 +65,38 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo"
+ id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HDate" id="HDate"
+ autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
<div class="layui-input-inline">
- <input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
+ <input type="text" name="HInnerBillNo" id="HInnerBillNo"
+ class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HMouldName" id="HMouldName"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldID" id="HMouldID"
+ class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HMouldList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -88,36 +109,56 @@
</div>
</div>-->
<div class="layui-inline">
- <label class="layui-form-label">鐐规璁″垝缂栧彿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鐐规璁″垝缂栧彿<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="hidden" name="HMouldDotCheckPlanEntryID" id="HMouldDotCheckPlanEntryID" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="hidden" name="HMouldDotCheckPlanInterID" id="HMouldDotCheckPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanInterList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HPlanNo" id="HPlanNo" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <input type="hidden" name="HPlanInterID" id="HPlanInterID"
+ class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldDotCheckPlanEntryID"
+ id="HMouldDotCheckPlanEntryID" class="layui-input" value="0"
+ style="float:left;width:150px;">
+ <input type="hidden" name="HMouldDotCheckPlanInterID"
+ id="HMouldDotCheckPlanInterID" class="layui-input" value="0"
+ style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HPlanInterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐐规寮�濮嬫棩鏈�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HBeginDate" id="HBeginDate"
+ autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐐规缁撴潫鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HEndDate" id="HEndDate"
+ autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width:95px;">鍣ㄥ叿鐐规瑙勭▼<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width:95px;">鍣ㄥ叿鐐规瑙勭▼<label
+ style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HMouldDotCheckRuleName"
+ id="HMouldDotCheckRuleName" class="layui-input" value=""
+ style="float:left;width:150px;">
+ <input type="hidden" name="HMouldDotCheckRuleID"
+ id="HMouldDotCheckRuleID" class="layui-input" value="0"
+ style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="btnHMouldDotCheckRule" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -126,28 +167,37 @@
<div class="layui-inline">
<label class="layui-form-label">寮傚父鎯呭喌璁板綍</label>
<div class="layui-input-inline">
- <input type="text" name="HErrNote" id="HErrNote" class="layui-input">
+ <input type="text" name="HErrNote" id="HErrNote"
+ class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">閲嶅ぇ瀹夊叏<br />闅愭偅璁板綍</label>
<div class="layui-input-inline" style="margin-top:10px;">
- <input type="text" name="HBigSafeNote" id="HBigSafeNote" class="layui-input">
+ <input type="text" name="HBigSafeNote" id="HBigSafeNote"
+ class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐐规鏁版嵁</label>
<div class="layui-input-inline">
- <input type="text" name="HDotCheckNote" id="HDotCheckNote" class="layui-input">
+ <input type="text" name="HDotCheckNote" id="HDotCheckNote"
+ class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐢熶骇鐝</label>
<div class="layui-input-inline">
- <input type="hidden" name="HShiftsID" id="HShiftsID" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="text" name="HShiftsName" id="HShiftsName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly="readonly">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHShifts" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="hidden" name="HShiftsID" id="HShiftsID"
+ class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HShiftsName" id="HShiftsName"
+ class="layui-input" value=""
+ style="float:left;width:150px;background-color:#efefef4d;"
+ readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="btnHShifts" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -157,20 +207,24 @@
<div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea"
+ name="HExplanation" id="HExplanation"></textarea>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark"
+ id="HRemark"></textarea>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏈�缁堢粨璁�</label>
<div class="layui-input-inline">
- <input type="radio" name="HLastResult" id="HLastResult" value="OK" title="OK" checked>
- <input type="radio" name="HLastResult" id="HLastResult" value="NG" title="NG">
+ <input type="radio" name="HLastResult" id="HLastResult" value="OK"
+ title="OK" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="NG"
+ title="NG">
</div>
</div>
</div>
@@ -179,7 +233,9 @@
<div class="layui-tab-item">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-upload">
- <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+ <button type="button" class="layui-btn"
+ id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file"
+ type="file" accept="" name="file" multiple="">
<div class="layui-upload-list">
<table class="layui-table" lay-filter="fileTable">
<thead>
@@ -204,25 +260,29 @@
<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" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMaker" id="HMaker"
+ style="background-color:#efefef4d;" readonly>
</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" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HChecker" id="HChecker"
+ style="background-color:#efefef4d;" readonly>
</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" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCloseMan"
+ id="HCloseMan" style="background-color:#efefef4d;" readonly>
</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" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -231,25 +291,29 @@
<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" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMakeDate"
+ id="HMakeDate" style="background-color:#efefef4d;" readonly>
</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" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCheckDate"
+ id="HCheckDate" style="background-color:#efefef4d;" readonly>
</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" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCloseDate"
+ id="HCloseDate" style="background-color:#efefef4d;" readonly>
</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" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpDateDate"
+ id="HUpDateDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -257,13 +321,15 @@
<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" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HDeleteMan"
+ id="HDeleteMan" style="background-color:#efefef4d;" readonly>
</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" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HDeleteDate"
+ id="HDeleteDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -303,11 +369,11 @@
</div>
<script type="text/html" id="barDemo">
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<script type="text/html" id="barDemo1">
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
</script>
<!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
<script type="text/html" id="HDotCheckResult">
@@ -324,7 +390,9 @@
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
<script>
+ var optionData = []
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
@@ -464,7 +532,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html?openType=2', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html?openType=HShiftsList&OperationType=2 ', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -623,6 +691,14 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (optionData.length > 0) {
+ obj.update({
+ HManagerID: optionData[0].HItemID,
+ HManagerNumber: optionData[0].鑱屽憳浠ｇ爜,
+ HManagerName: optionData[0].鑱屽憳鍚嶇О,
+ });
+ optionData = []
+ }
}
});
}
@@ -649,7 +725,9 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HDotCheckItemID: checkStatus.data[0].HItemID,
- HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О
+ HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+ HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -658,6 +736,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (optionData.length > 0) {
+ obj.update({
+ HDotCheckItemID: optionData[0].HItemID,
+ HDotCheckItem: optionData[0].鐐规椤圭洰鍚嶇О,
+ HDotCheckItemClassID: optionData[0].HDotCheckItemClassID,
+ HDotCheckItemClassName: optionData[0].鐐规椤圭洰鍒嗙被鍚嶇О
+ });
+ optionData = []
+ }
}
});
}
@@ -724,6 +811,14 @@
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }, end: function () {
+ if (optionData.length > 0) {
+ obj.update({
+ HDotCheckItemMethodID: optionData[0].HItemID,
+ HDotCheckItemMethodName: optionData[0].鐐规鏂规硶鍚嶇О
+ });
+ optionData = []
+ }
}
});
}
@@ -787,6 +882,34 @@
window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldDotCheckBill&OpenTmp=鍣ㄥ叿鐐规璁板綍鏉＄爜");
});
+
+ // 瀹℃牳
+ form.on('submit(Checker)', function (data) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = linterid;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldDotCheckBill/CheckSc_MouldDotCheckBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ $('#add-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ 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);
+ }
+ });
+ })
+ })
+
//閫�鍑�
form.on('submit(Exit)', function (data) {//
if (linterid == undefined) {
@@ -816,14 +939,17 @@
laydate.render({
elem: '#HEndDate'
});
+
+ $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true)
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
//琛ㄥご
+ let hiddenStyle = 'background: #eeeeee;'
columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { templet: '#xuhao', title: '搴忓彿', style: hiddenStyle, sort: true, fixed: 'left', event: "qwe" }
, { field: 'HDotCheckItemID', title: '鐐规ID', edit: 'text', hide: true }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: 'HDotCheckItem' }
, { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
@@ -835,7 +961,7 @@
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
, { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
- , { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
+ , { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', style: hiddenStyle }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
];
@@ -1024,7 +1150,7 @@
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
- url: GetWEBURL() + "Sc_MouldDotCheckBill/Sc_MouldDotCheckBillListCheckDetai",
+ url: GetWEBURL() + "/Sc_MouldDotCheckBill/Sc_MouldDotCheckBillListCheckDetai",
type: "GET",
data: {
"HID": linterid
@@ -1065,6 +1191,12 @@
, "HDeleteMan": data.浣滃簾浜�
, "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
+
+ if (isEmpty(data.瀹℃牳浜�) == false) {
+ $("#add-btn").addClass('layui-btn-disabled').attr('disabled', true)
+ } else {
+ $("#check-btn").removeClass('layui-btn-disabled').attr('disabled', false)
+ }
if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
$("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
@@ -1101,7 +1233,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sc_MouldDotCheckBill/Sc_MouldDotCheckBillListProjectDetai',
+ url: GetWEBURL() + '/Sc_MouldDotCheckBill/Sc_MouldDotCheckBillListProjectDetai',
type: "GET",
data: { "sqlWhere": "and HInterID=" + linterid },
success: function (result) {
@@ -1343,6 +1475,12 @@
get_DocCheckItem2(obj[0].hmainid);
}
+ function GetHShiftsListValue(obj) {
+ $("#HShiftsID").val(obj.HItemID);
+ $("#HShiftsName").val(obj.鐝鍚嶇О);
+ }
+
+
function previewImg(obj) {
var img = new Image();
img.src = obj.src;
@@ -1408,6 +1546,20 @@
})
}
+ //#region 鍙屽嚮杩斿洖 鍥炶皟鍑芥暟
+ function GetDotCheckListValue(data) {
+ optionData[0] = data
+ }
+
+ function GetDotCheckItemMethodListValue(data) {
+ optionData[0] = data
+ }
+
+ function GetHManagerValue(data) {
+ optionData = data
+ }
+ //#endregion
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
index bb62ce4..ce4345c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
@@ -1,11 +1,13 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
<title>鏂板/缂栬緫鍣ㄥ叿淇濆吇璁板綍琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<style type="text/css">
@@ -17,6 +19,7 @@
.layui-table-cell {
overflow: visible !important;
}
+
/* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
td .layui-form-select {
margin-top: -10px;
@@ -25,8 +28,8 @@
}
</style>
</head>
-<body>
+<body>
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
@@ -34,11 +37,16 @@
<form id="component-form-group" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<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" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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>
+ <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" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Saver">淇濆瓨</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>
</div>
</div>
<div class="layui-card-body">
@@ -55,78 +63,113 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo"
+ id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HDate" id="HDate"
+ autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline" style="display:none;">
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
<div class="layui-input-inline">
- <input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
+ <input type="text" name="HInnerBillNo" id="HInnerBillNo"
+ class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HMouldName" id="HMouldName"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldID" id="HMouldID"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HMouldList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">淇濆吇璁″垝缂栧彿</label>
<div class="layui-input-inline">
- <input type="hidden" name="HPlanNo" id="HPlanNo" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="text" name="HPlanName" id="HPlanName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldMaintainPlanEntryID" id="HMouldMaintainPlanEntryID" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="hidden" name="HMouldMaintainPlanInterID" id="HMouldMaintainPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0" readonly>
- <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0" readonly>
- <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0" readonly>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="hidden" name="HPlanNo" id="HPlanNo" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <input type="text" name="HPlanName" id="HPlanName"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldMaintainPlanEntryID"
+ id="HMouldMaintainPlanEntryID" class="layui-input" value="0"
+ style="float:left;width:150px;">
+ <input type="hidden" name="HMouldMaintainPlanInterID"
+ id="HMouldMaintainPlanInterID" class="layui-input" value="0"
+ style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceInterID"
+ id="HMainSourceInterID" value="0" readonly>
+ <input type="hidden" name="HMainSourceEntryID"
+ id="HMainSourceEntryID" value="0" readonly>
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo"
+ value="0" readonly>
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HPlanList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇瑙勭▼<label style="color:red"> * </label></label>
+ <label class="layui-form-label">淇濆吇瑙勭▼<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="hidden" name="HMouldMaintainRuleInterID" id="HMouldMaintainRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
- <input type="text" name="HMouldMaintainRuleInterNo" id="HMouldMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldMaintainRuleInterList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="hidden" name="HMouldMaintainRuleInterID"
+ id="HMouldMaintainRuleInterID" class="layui-input" value=""
+ style="float:left;width:150px;">
+ <input type="text" name="HMouldMaintainRuleInterNo"
+ id="HMouldMaintainRuleInterNo" class="layui-input" value=""
+ style="float:left;width:150px;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HMouldMaintainRuleInterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">淇濆吇寮�濮嬫棩鏈�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HBeginDate" id="HBeginDate"
+ autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">淇濆吇缁撴潫鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HEndDate" id="HEndDate"
+ autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">淇濆吇绾у埆</label>
<div class="layui-input-inline">
- <input type="hidden" name="HMaintainLevID" id="HMaintainLevID" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="text" name="HMaintainLevName" id="HMaintainLevName" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnMaintainLev" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="hidden" name="HMaintainLevID" id="HMaintainLevID"
+ class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HMaintainLevName" id="HMaintainLevName"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="btnMaintainLev" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -135,25 +178,33 @@
<div class="layui-inline">
<label class="layui-form-label">瑕佹眰瀹屾垚鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" id="HRequestComDate" name="HRequestComDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" id="HRequestComDate"
+ name="HRequestComDate" autocomplete="off" model="datetime"
+ dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏈�杩戜繚鍏绘ā鏁�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HRecentMainModule" lay-verify="HRecentMainModule" id="HRecentMainModule" value="0" autocomplete="off">
+ <input class="layui-input" name="HRecentMainModule"
+ lay-verify="HRecentMainModule" id="HRecentMainModule" value="0"
+ autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">绱妯℃暟</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HCumulativeModule" lay-verify="HCumulativeModule" id="HCumulativeModule" value="0" autocomplete="off">
+ <input class="layui-input" name="HCumulativeModule"
+ lay-verify="HCumulativeModule" id="HCumulativeModule" value="0"
+ autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏈鐢熶骇妯℃暟</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HProductionModule" lay-verify="HProductionModule" id="HProductionModule" value="0" autocomplete="off">
+ <input class="layui-input" name="HProductionModule"
+ lay-verify="HProductionModule" id="HProductionModule" value="0"
+ autocomplete="off">
</div>
</div>
</div>
@@ -161,20 +212,24 @@
<div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea"
+ name="HExplanation" id="HExplanation"></textarea>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark"
+ id="HRemark"></textarea>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏈�缁堢粨璁�</label>
<div class="layui-input-inline">
- <input type="radio" name="HLastResult" id="HLastResult" value="OK" title="OK" checked>
- <input type="radio" name="HLastResult" id="HLastResult" value="NG" title="NG">
+ <input type="radio" name="HLastResult" id="HLastResult" value="OK"
+ title="OK" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="NG"
+ title="NG">
</div>
</div>
</div>
@@ -183,7 +238,9 @@
<div class="layui-tab-item">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-upload">
- <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+ <button type="button" class="layui-btn"
+ id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file"
+ type="file" accept="" name="file" multiple="">
<div class="layui-upload-list">
<table class="layui-table" lay-filter="fileTable">
<thead>
@@ -208,25 +265,29 @@
<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" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMaker" id="HMaker"
+ style="background-color:#efefef4d;" readonly>
</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" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HChecker" id="HChecker"
+ style="background-color:#efefef4d;" readonly>
</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" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCloseMan"
+ id="HCloseMan" style="background-color:#efefef4d;" readonly>
</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" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -235,25 +296,29 @@
<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" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMakeDate"
+ id="HMakeDate" style="background-color:#efefef4d;" readonly>
</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" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCheckDate"
+ id="HCheckDate" style="background-color:#efefef4d;" readonly>
</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" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCloseDate"
+ id="HCloseDate" style="background-color:#efefef4d;" readonly>
</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" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpDateDate"
+ id="HUpDateDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -261,13 +326,15 @@
<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" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HDeleteMan"
+ id="HDeleteMan" style="background-color:#efefef4d;" readonly>
</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" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HDeleteDate"
+ id="HDeleteDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -294,7 +361,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>
<script type="text/html" id="toolbarDemo1">
@@ -302,6 +369,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_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -318,11 +386,11 @@
</div>
<script type="text/html" id="barDemo">
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<script type="text/html" id="barDemo1">
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
</script>
<!--琛屼笅鎷夐�夋嫨(淇濆吇缁撴灉)-->
<script type="text/html" id="HMaintainResult">
@@ -339,7 +407,10 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<script>
+ var optionData = []
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
@@ -379,6 +450,8 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
+ var HModName1 = 'Sc_Add_MouldMaintainBillList_Sub1'
+ var HModName = 'Sc_Add_MouldMaintainBillList_Sub'
//#endregion
//鍒濆鍖栬〃鍗曟彃浠�
@@ -424,6 +497,8 @@
//澶嶅埗涓�琛�
case 'btn-CopyLine': btnCopyLine(data);
break;
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
}
});
@@ -440,6 +515,8 @@
break;
//澶嶅埗涓�琛�
case 'btn-CopyLine1': btnCopyLine1(data);
+ break;
+ case 'set_HideColumn': get_HideColumnNoPage(HModName1, sessionStorage["HUserName"], option2, get_FastQuery);
break;
}
});
@@ -883,14 +960,38 @@
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
- }
+ } else if (checkStatus.data.length === 1) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMaintainItemID: checkStatus.data[0].HItemID,
+ HMaintainItemNumber: checkStatus.data[0].淇濆吇椤圭洰浠ｇ爜,
+ HMaintainItem: checkStatus.data[0].淇濆吇椤圭洰鍚嶇О,
+ });
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMaintainItemID: checkStatus.data[0].HItemID,
- HMaintainItemNumber: checkStatus.data[0].淇濆吇椤圭洰浠ｇ爜,
- HMaintainItem: checkStatus.data[0].淇濆吇椤圭洰鍚嶇О,
- });
+ }
+ else if (checkStatus.data.length > 1) {
+ let tableBak = table.cache["mainTable"];
+ let tempArr = []; //涓存椂鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) { // 缂撳瓨宸茬紪杈戠殑鏁版嵁
+ if (isEmpty(tableBak[i]['HMaintainItemID'], true, true) === false) {
+ tempArr.push(tableBak[i]); //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+ }
+ }
+
+ //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ tempArr.push({
+ HMaintainItemID: checkStatus.data[i].HItemID,
+ HMaintainItemNumber: checkStatus.data[i].淇濆吇椤圭洰浠ｇ爜,
+ HMaintainItem: checkStatus.data[i].淇濆吇椤圭洰鍚嶇О,
+ });
+
+ }
+ table.reload("mainTable", {
+ data: tempArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+
+ }
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -898,6 +999,14 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (optionData.length > 0) {
+ obj.update({
+ HMaintainItemID: optionData[0].HItemID,
+ HMaintainItemNumber: optionData[0].淇濆吇椤圭洰浠ｇ爜,
+ HMaintainItem: optionData[0].淇濆吇椤圭洰鍚嶇О,
+ });
+ optionData = []
+ }
}
});
}
@@ -972,14 +1081,44 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- console.log(checkStatus.data[0]);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMaterID: checkStatus.data[0].HItemID,
- HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜,
- HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О,
- HMaterSpec: checkStatus.data[0].瑙勬牸鍨嬪彿,
- });
+ else if (checkStatus.data.length === 1) {
+ obj.update({
+ HMaterID: checkStatus.data[0].HItemID,
+ HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜,
+ HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О,
+ HMaterSpec: checkStatus.data[0].瑙勬牸鍨嬪彿,
+ HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜,
+ HUnitName: checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О,
+ });
+ }
+ else if (checkStatus.data.length > 1) {
+ let tableBak = table.cache["mainTable1"];
+ let tempArr = []; //涓存椂鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) { // 缂撳瓨宸茬紪杈戠殑鏁版嵁
+ if (isEmpty(tableBak[i]['HMaterID'], true, true) === false) {
+ tempArr.push(tableBak[i]); //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+ }
+ }
+
+ //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ tempArr.push({
+ HMaterID: checkStatus.data[i].HItemID,
+ HMaterNumber: checkStatus.data[i].鐗╂枡浠ｇ爜,
+ HMaterName: checkStatus.data[i].鐗╂枡鍚嶇О,
+ HMaterSpec: checkStatus.data[i].瑙勬牸鍨嬪彿,
+ HUnitNumber: checkStatus.data[i].璁￠噺鍗曚綅浠ｇ爜,
+ HUnitName: checkStatus.data[i].璁￠噺鍗曚綅鍚嶇О,
+ });
+
+ }
+ table.reload("mainTable1", {
+ data: tempArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+
+ }
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -987,6 +1126,17 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (optionData.length > 0) {
+ obj.update({
+ HMaterID: optionData[0].HItemID,
+ HMaterNumber: optionData[0].鐗╂枡浠ｇ爜,
+ HMaterName: optionData[0].鐗╂枡鍚嶇О,
+ HMaterSpec: optionData[0].瑙勬牸鍨嬪彿,
+ HUnitNumber: optionData[0].璁￠噺鍗曚綅浠ｇ爜,
+ HUnitName: optionData[0].璁￠噺鍗曚綅鍚嶇О,
+ });
+ }
+ optionData = []
}
});
}
@@ -1137,19 +1287,20 @@
//鍒濆鍖栦繚鍏婚」鍒楄〃
function Table1() {
+ let hiddenStyle = "background: #eeeeee;"
//琛ㄥご
columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', style: hiddenStyle, sort: true, fixed: 'left' }
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
, { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: 'HMaintainItemNumber' }
- , { field: 'HMaintainItem', title: '淇濆吇椤圭洰' }
+ , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', style: hiddenStyle }
, { field: 'HMaintainResult', title: '淇濆吇缁撴灉', templet: '#HMaintainResult', event: 'HMaintainResult' }
, { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
, { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
- , { field: 'HManagerName', title: '璐熻矗浜�' }
+ , { field: 'HManagerName', title: '璐熻矗浜�', style: hiddenStyle }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -1170,19 +1321,20 @@
//鍒濆鍖栭厤浠堕」鍒楄〃
function Table2() {
+ let hiddenColor = 'background: #eeeeee;'
//琛ㄥご
columns1 = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left' }
+ , { templet: '#xuhao1', title: '搴忓彿', style: hiddenColor, sort: true, fixed: 'left' }
, { field: 'HMaterID', title: '閰嶄欢ID', edit: 'text', hide: true }
, { field: 'HMaterNumber', title: '閰嶄欢浠ｇ爜', edit: 'text', event: "HMaterNumber" }
- , { field: 'HMaterName', title: '閰嶄欢鍚嶇О' }
- , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿' }
+ , { field: 'HMaterName', title: '閰嶄欢鍚嶇О', style: hiddenColor }
+ , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', style: hiddenColor }
, { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
, { field: 'HUnitNumber', title: '鍗曚綅浠ｇ爜', edit: 'text', event: "HUnitNumber" }
- , { field: 'HUnitName', title: '鍗曚綅鍚嶇О' }
+ , { field: 'HUnitName', title: '鍗曚綅鍚嶇О', style: hiddenColor }
, { field: 'HQty', title: '瀹為檯鐢ㄩ噺', edit: 'text', totalRow: true }
- , { field: 'HQtyMust', title: '鏍囧噯鐢ㄩ噺', edit: 'text', totalRow: true }
+ , { field: 'HQtyMust', title: '鏍囧噯鐢ㄩ噺', totalRow: true, style: hiddenColor }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo1' }
];
@@ -1247,7 +1399,7 @@
function set_EditForm(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
- url: GetWEBURL() + "Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai",
+ url: GetWEBURL() + "/Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai",
type: "GET",
data: {
"HID": linterid
@@ -1318,12 +1470,19 @@
return [year, month, day].join('-');
}
+ function get_FastQuery(){
+
+ table.render(option);
+ table.render(option2);
+
+ }
+
// 缂栬緫鑾峰彇琛ㄤ綋
function set_EditGrid(linterid) {
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
+ url: GetWEBURL() + '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
type: "GET",
data: { "HInterID": linterid },
success: function (result) {
@@ -1672,6 +1831,14 @@
})
}
+ function GetGyMaterial(data) {
+ optionData[0] = data
+ }
+ function GetMaintainListValue(data) {
+ optionData[0] = data
+ }
+
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
index 7b4b8a5..54633da 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鍣ㄥ叿鏁呴殰鐧昏琛ㄥ垪琛�</title>
@@ -20,6 +21,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -34,43 +36,44 @@
</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">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫椂闂�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemest" name="HBeginDate" id="HBeginDate">
+ <input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate"
+ id="HBeginDate">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃堕棿</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate" id="HEndDate">
+ <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate"
+ id="HEndDate">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 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-row">
@@ -82,21 +85,45 @@
</div>
<div class="layui-row">
<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>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -104,26 +131,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
+ lay-filter="Comparator1" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -131,26 +165,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
+ lay-filter="Comparator2" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -158,7 +199,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -169,7 +211,9 @@
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Export" id="btn-Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-reload" id="btn-reload"><i class="layui-icon layui-icon-refresh"></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>
@@ -199,7 +243,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏ㄥ眬鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -244,7 +288,7 @@
//#endregion
//鍒濆鍖栫晫闈�
- set_ClearBill();
+ set_ClearBill();
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -258,8 +302,14 @@
//缂栬緫
case 'btn-Edit': set_ShowBill();
break;
+ //澶嶅埗
+ case 'btn-Copy': set_CopyBill();
+ break;
//鍒犻櫎
case 'btn-Delete': set_DeleteBill();
+ break;
+ //瀵煎嚭
+ case 'btn-Export': get_Export();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -296,6 +346,14 @@
break;
};
});
+
+ // 鑷畾涔夊伐鍏锋爮浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ let data = obj.data;
+ switch (obj.event) {
+ case "onHBillNumberClickHandler": onHBillNumberClickHandler(data); break;
+ }
+ })
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
@@ -381,6 +439,8 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栫粍缁�
+ Organ();
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
setSelect_HInitTimeCycle();
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -451,7 +511,7 @@
, { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115}
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115 }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
, { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
@@ -497,7 +557,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -509,7 +569,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, titleData) > -1 ) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
@@ -524,7 +584,7 @@
case 'double':
case 'Decimal':
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
- break;
+ break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
}
@@ -553,8 +613,9 @@
DisPlay_HideColumn();
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule()
}
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -700,7 +761,7 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 160 });
break;
case 'Decimal':
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
@@ -709,7 +770,16 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+ if (data[i].name === '鍗曟嵁鍙�') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+ templet: function (d) {
+ return '<span style="color: blue;" lay-unrow >' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
+ });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+ }
}
}
}
@@ -727,8 +797,9 @@
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"]);
@@ -794,6 +865,37 @@
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+
+ }
+
+ function set_CopyBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗' + HPageTitle
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鍒讹紒');
}
}
@@ -903,7 +1005,7 @@
}
}
//#endregion
-
+
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
@@ -973,7 +1075,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
type: "GET",
- data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": '0', "Type": "Default" },
success: function (data1) {
if (data1.count == 1) {
//褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
@@ -1031,6 +1133,30 @@
});
}
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
//淇濆瓨鏂规
function set_SaveScheme() {
var index = layer.open()
@@ -1038,7 +1164,7 @@
var HIsClose_Manual = false;
//鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
var Filter = document.getElementsByClassName(HClassTag);
-
+ debugger
var HFilterIdList = "";//杩囨护鏉′欢
var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
var HValue = "";//杩囨护鍊�
@@ -1190,6 +1316,53 @@
})
}
+ //#region 瓒呴摼鎺ョ粦瀹氬嚱鏁�
+ function onHBillNumberClickHandler(data) {
+ var linterid = data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Sc_MouldConkBookBillList_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
@@ -1198,8 +1371,9 @@
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
- var HInterID = obj[0].HInterID;
- HInterID_Choose = obj[0].HInterID;
+ debugger
+ var HInterID = obj[0].hmainid;
+ HInterID_Choose = obj[0].hmainid;
$.ajax({
url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
type: "GET",
@@ -1238,4 +1412,5 @@
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
index 9b11e2d..3371e56 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鍣ㄥ叿鐐规璁板綍琛ㄥ垪琛�</title>
@@ -19,6 +20,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -35,48 +37,57 @@
<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">
+ <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">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫椂闂�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate" id="HBeginDate">
+ <input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate"
+ id="HBeginDate">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃堕棿</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate" id="HEndDate">
+ <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate"
+ id="HEndDate">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" 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">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 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-row">
<div class="layui-inline">
<label class="layui-form-label">浜у搧鍣ㄥ叿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="PartModul" id="PartModul">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="PartModul" id="PartModul">
</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="CheckItem" id="CheckItem">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="CheckItem" id="CheckItem">
</div>
</div>
</div>
@@ -84,19 +95,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -104,26 +121,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
+ lay-filter="Comparator1" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -131,26 +155,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
+ lay-filter="Comparator2" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -158,7 +189,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -202,7 +234,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -355,6 +387,15 @@
break;
};
});
+
+ // 琛ㄦ牸鍐呰嚜瀹氫箟浜嬩欢鐩戝惉
+ table.on('tool(mainTable)', function (obj) {
+ let data = obj.data
+ switch (obj.event) {
+ case "onHBillNumberClickHandler": onHBillNumberClickHandler(data); break;
+ }
+ })
+
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -419,7 +460,7 @@
$("#Comparator1").val("0");
form.render('select');
sWhere = "";
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
@@ -536,7 +577,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 450
+ , height: 'full-150'
, page: false
, cellMinWidth: 90
, limit: 50
@@ -640,7 +681,7 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 160 });
break;
case 'Decimal':
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
@@ -649,7 +690,17 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+ if (data[i].name === '鍗曟嵁鍙�') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+ templet: function (d) {
+ return '<span style="color: blue;" lay-unrow >' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
+ });
+ }
+ else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+ }
}
}
}
@@ -668,8 +719,9 @@
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule()
}
} else {
@@ -745,7 +797,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Sc_MouldDotCheckBill/DeltetSc_MouldDotCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID,"user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -892,7 +944,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, titleData) > -1 ) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
@@ -944,8 +996,9 @@
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule()
}
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -958,7 +1011,7 @@
}
});
}
-
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -1240,6 +1293,28 @@
})
}
+ function onHBillNumberClickHandler(data) {
+ var hID = 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: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+
//#endregion
});
@@ -1249,7 +1324,7 @@
$("#HMouldDotCheckRuleID").val(obj[0].hmainid);
get_DocCheckItem2(obj[0].hmainid);
}
-
+
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
@@ -1292,4 +1367,5 @@
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
index 9271b1d..8be606b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鍣ㄥ叿淇濆吇璁板綍琛ㄥ垪琛�</title>
@@ -19,6 +20,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -35,60 +37,75 @@
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫椂闂�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate" id="HBeginDate">
+ <input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate"
+ id="HBeginDate">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃堕棿</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate" id="HEndDate">
+ <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate"
+ id="HEndDate">
</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">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" 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">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 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-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-row">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -96,26 +113,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
+ lay-filter="Comparator1" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -123,26 +147,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
+ lay-filter="Comparator2" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -150,7 +181,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -216,7 +248,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
// #region 鍏ㄥ眬鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -245,7 +277,7 @@
var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
var ins;
- var titleData = ["hmainid","鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HMouldID","HEmpID","HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HMouldID", "HEmpID", "HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -274,7 +306,7 @@
//#endregion
//鍒濆鍖栫晫闈�
- set_ClearBill();
+ set_ClearBill();
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -331,34 +363,12 @@
};
});
- //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
- table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
- //var flag = !obj.tr.find(':checkbox:first').prop('checked');
- //obj.tr.find(':checkbox').prop('checked', flag);
- //if (flag) {
- // obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');
- // obj.tr.next().find('.layui-form-checkbox').removeClass('layui-form-checked');
- //}
- var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
- var linterid = datas.hmainid;
- $.ajax({
- url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
- type: "GET",
- data: { "HInterID": linterid },
- success: function (data1) {
- if (data1.count == 1) {
- option1.data = data1.list[0];
- table1.render(option1);
- option2.data = data1.list[1];
- table2.render(option2);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- }
- });
- });
+ table.on('tool(mainTable)', function (obj) {
+ let data = obj.data
+ switch (obj.event) {
+ case "onHBillNumberClickHandler": onHBillNumberClickHandler(data); break;
+ }
+ })
// 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
@@ -395,8 +405,8 @@
//#endregion
- //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
- // 鍒濆鍖栫晫闈�
+ //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
+ // 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
setSelect_HInitTimeCycle();
@@ -430,7 +440,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: '400'
+ , height: 'full-250'
, page: false
, totalRow: true
, cellMinWidth: 90
@@ -504,12 +514,13 @@
l.LAY_CHECKED = flag;
}
});
+
+ get_subTable(obj)
})
//#endregion
//鍒濆鍖栬〃鏍�(瀛愯〃)
- function set_InitGrid1()
- {
+ function set_InitGrid1() {
var ajaxLoad = layer.load();
option1 = {
elem: '#mainTable1'
@@ -524,14 +535,14 @@
//{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', width: 200, hide: true }
- , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', width: 200}
- , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', width: 200}
- , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', width: 200}
- , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', width: 200}
+ , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', width: 200 }
+ , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', width: 200 }
+ , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', width: 200 }
+ , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', width: 200 }
, { field: 'HManagerID', title: '璐熻矗浜篒D', width: 200, hide: true }
- , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', width: 200}
- , { field: 'HManagerName', title: '璐熻矗浜�', width: 200}
- , { field: 'HRemark', title: '澶囨敞', width: 200}
+ , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', width: 200 }
+ , { field: 'HManagerName', title: '璐熻矗浜�', width: 200 }
+ , { field: 'HRemark', title: '澶囨敞', width: 200 }
]]
};
option1.data = [];
@@ -554,17 +565,17 @@
, cols: [[
//{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- , { field: 'HMaterID', title: '閰嶄欢ID', width:200, hide: true }
- , { field: 'HMaterNumber', title: '閰嶄欢浠ｇ爜', width: 200}
- , { field: 'HMaterName', title: '閰嶄欢鍚嶇О', width: 200}
- , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', width: 200}
+ , { field: 'HMaterID', title: '閰嶄欢ID', width: 200, hide: true }
+ , { field: 'HMaterNumber', title: '閰嶄欢浠ｇ爜', width: 200 }
+ , { field: 'HMaterName', title: '閰嶄欢鍚嶇О', width: 200 }
+ , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', width: 200 }
, { field: 'HUnitID', title: '鍗曚綅ID', width: 200, hide: true }
- , { field: 'HUnitNumber', title: '鍗曚綅浠ｇ爜', width: 200}
- , { field: 'HUnitName', title: '鍗曚綅鍚嶇О', width: 200}
- , { field: 'HQty', title: '瀹為檯鐢ㄩ噺', width: 200, totalRow: true}
+ , { field: 'HUnitNumber', title: '鍗曚綅浠ｇ爜', width: 200 }
+ , { field: 'HUnitName', title: '鍗曚綅鍚嶇О', width: 200 }
+ , { field: 'HQty', title: '瀹為檯鐢ㄩ噺', width: 200, totalRow: true }
, { field: 'HQtyMust', title: '鏍囧噯鐢ㄩ噺', width: 200, totalRow: true }
, { field: 'HManagerID', title: '璐熻矗浜篒D', width: 200, hide: true }
- , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', width: 200}
+ , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', width: 200 }
, { field: 'HManagerName', title: '璐熻矗浜�', width: 200 }
, { field: 'HRemark', title: '澶囨敞', width: 200 }
]]
@@ -581,7 +592,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MouldMaintainBill/GetMouldMaintainBillList',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -598,7 +609,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, titleData) > -1 ) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
@@ -649,8 +660,9 @@
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule()
}
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -698,7 +710,7 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 160 });
break;
case 'Decimal':
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
@@ -707,7 +719,17 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+ if (data[i].name === '鍗曟嵁鍙�') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+ templet: function (d) {
+ return '<span style="color: blue;" lay-unrow >' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
+ });
+ }
+ else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+ }
}
}
}
@@ -728,8 +750,9 @@
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule()
}
} else {
@@ -739,6 +762,28 @@
}, error: function () {
layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ function get_subTable(obj) {
+ var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+ var linterid = datas.hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
+ type: "GET",
+ data: { "HInterID": linterid },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option1.data = data1.list[0];
+ table1.render(option1);
+ option2.data = data1.list[1];
+ table2.render(option2);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
}
@@ -825,8 +870,11 @@
sWhere += " and " + ColName2 + " " + com2;
}
if (HBillNo) {
- sWhere += " and HBillNo like '%" + HBillNo + "%'";
- }
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if(HCreateBy) {
+ sWhere += " and 鍒跺崟浜� like '%" + HCreateBy + "%'";
+ }
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
@@ -863,8 +911,7 @@
}
//鏂板
- function set_AddNew()
- {
+ function set_AddNew() {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -886,8 +933,7 @@
}
//缂栬緫
- function set_ShowBill()
- {
+ function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
@@ -942,8 +988,7 @@
}
}
//鍒犻櫎
- function set_DeleteBill()
- {
+ function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
@@ -1120,34 +1165,15 @@
$("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
}
}
-
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
-
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
-
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery();
- } else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
- }
-
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //鏌ヨ
+ get_FastQuery();
form.render("select");
} else {
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
- ////鎵ц鏌ヨ鏂规硶
- //get_FastQuery()
- //form.render("select");
+ //鎵ц鏌ヨ鏂规硶
+ form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1314,6 +1340,29 @@
})
}
+ // 瓒呴摼鎺ョ偣鍑诲鐞�
+ function onHBillNumberClickHandler(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: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
@@ -1362,4 +1411,5 @@
</script>
</body>
-</html>
+
+</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\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index b76fdf6..b101084 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -554,6 +554,8 @@
$("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭杞﹂棿
$("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
$("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ $('#btn_PrevPage').addClass('layui-btn-disabled').attr('disabled', true)
+ $('#btn_NextPage').addClass('layui-btn-disabled').attr('disabled', true)
}
else if (OperationType == 2) { //澶嶅埗
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit_HistoryRecord.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit_HistoryRecord.html"
index 9ad31cd..8f8b0f3 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit_HistoryRecord.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit_HistoryRecord.html"
@@ -243,6 +243,7 @@
, limit: 500
, height: 'full-100'
, loading: false
+ , data: []
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', width: 100 }
@@ -336,12 +337,15 @@
}
debugger
let result = data.data
- layer.close(ajaxLoad);
+
option.data = result
table.render(option)
+ layer.close(ajaxLoad);
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ option.data = []
+ table.render(option)
layer.close(ajaxLoad);
}
},
--
Gitblit v1.9.1