From 94853e46b9d4911fb4cf00389f00a4b820db5d3c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 14:35:46 +0800
Subject: [PATCH] fix: 修正 系统上机日志查询 没有显示默认方案的问题
---
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 642 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 514 insertions(+), 128 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index 6871427..5197a15 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -5,13 +5,14 @@
<title>榻愬鎶ヨ〃</title>
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <!--<script src="../../../layuiadmin/soulTable.slim.js"></script>--> <!--鏍囬绛涢�変笉鑳藉紩鐢ㄦjs鏂囦欢-->
</head>
<body>
<div class="layui-fluid">
@@ -24,14 +25,6 @@
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
- </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">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
</div>
</div>
<div class="layui-inline">
@@ -48,17 +41,45 @@
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="DeptNAME" name="DeptNAME" id="DeptNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="DeptNAME" name="DeptNAME" id="DeptNAME" value="" style="width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <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" style="width: 85px;">璁″垝鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 58px;width:160px;">
+ </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="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 58px;width:160px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">瀵煎嚭</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="bthHideColumn" id="bthHideColumn">鍒楄缃�</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin: 10px 0 10px;">
+ <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">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -81,89 +102,95 @@
<input type="text" class="layui-input" name="HMOBILLNO" id="HMOBILLNO">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <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>
- </div>
- </div>
- <div class="layui-inline">
- <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="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="ColContent" id="ColContent">
+ <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="HMaterAtt" id="HMaterAtt">
</div>
</div>
+ <!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <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>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="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="ColContent" id="ColContent">
+ </div>
+ </div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <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>
- </div>
- </div>
- <div class="layui-inline">
- <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="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: 10px; margin-left: 70px;">
+ <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>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="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: 10px; margin-left: 70px;">
- <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>
- </div>
- </div>
- <div class="layui-inline">
- <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="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 class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <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>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="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>
</div>
@@ -181,10 +208,18 @@
var treeCkData = { id: 0 };
var TagId = "";
var TagParentId = "";
+
+ //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+ var childPage = null; //鑾峰彇瀛愮獥鍙ｅ璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙ｇ殑鍙橀噺鍜屾柟娉�
+ var currRowIndex = 0; //鐢ㄤ簬瀹氫綅瀛愮獥鍙ｅ綋鍓嶉�変腑鐨勮
+ var childData = null; //鐢ㄤ簬鑾峰彇瀛愮獥鍙ｈ繑鍥炵殑鏁版嵁
+ //#endregion
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
- index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ soulTable: '../ext/soulTable'
}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
@@ -202,6 +237,8 @@
var sWhere = "";
var option = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HModName = "ReportMOMaterReadysBillList";
+ var titleData = [];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -212,6 +249,26 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ //$('#HDate').prop('disabled', true);
+ //$('#HDate1').prop('disabled', true);
+
+ $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//娆犳枡鏃ユ湡
+ $("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//鑷�
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ //$('#HDate').prop('disabled', false);
+ //$('#HDate1').prop('disabled', false);
+ }
+ });
+ //#endregion
//#region 浜у搧缂栫爜
form.on('submit(btnHMATERIALID)', function (data) {
@@ -249,12 +306,150 @@
});
//#endregion
+ //#region 鍒楄缃寜閽�
+ form.on('submit(bthHideColumn)', function (data) {
+ get_HideColumn();
+ });
+ //#endregion
+
+
+ //#region 鏂囨湰妗嗙洃鍚�
+ $(document).ready(function () {
+ //#region 鏍规嵁鐗╂枡浠ｇ爜鑾峰彇鐗╂枡鍩虹璧勬枡绛涢�夊脊绐�
+ //鏍规嵁鍏冪礌ID瀵瑰厓绱犺繘琛岀洃鍚�=============================================================================
+ $("#DeptNAME").on('keydown', function (data) {
+ //================================================================================================
+ var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+ if ($.inArray(event.key, errKeys) == -1) { //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+ if (childPage == null) { //鍒ゆ柇褰撳墠瀛愮獥鍙ｆ槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙ｇ殑瀵硅薄
+ var offset = $(this).offset(); //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+ var innerHeight = window.innerHeight;
+ var top = offset.top + 0.05 * innerHeight;
+ var left = offset.left;
+ if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+ top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+ }
+ layer.open({
+ type: 2 //寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['25%', '30%'] //澶у皬
+ , shadeClose: true //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+ , offset: [top, left]
+ , title: false //涓嶆樉绀烘爣棰樻爮
+ //, title: '椤圭洰璐圭敤鍒楄〃' //鏍囬
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , closeBtn: 0 //绂佺敤鍏抽棴鎸夐挳
+ , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseDataCheck.html?OperationType=2", "yes"]
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ 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('璇烽�夋嫨鏁版嵁');
+ }
+
+ var HIDValue = "";
+ var HNameValue = "";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ HIDValue += checkStatus.data[i].HItemID + ",";
+ HNameValue += checkStatus.data[i].閮ㄩ棬鍚嶇О + ",";
+ }
+
+ //鍘婚櫎鏈熬閫楀彿
+ HIDValue = HIDValue.substring(0, HIDValue.length - 1);
+ HNameValue = HNameValue.substring(0, HNameValue.length - 1);
+ $("#HDeptID").val(HIDValue);
+ $("#DeptNAME").val(HNameValue);
+ //鑾峰彇鏁版嵁
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , success: function (layero, index) {
+ setTimeout(function () {
+ //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+ var value = $("#DeptNAME").val().replace(/'/g, ""); //鑾峰彇鏂囨湰妗嗘渶鏂板��
+ currRowIndex = 0;
+ var tableView = "h_v_Gy_DepartmentList";
+ var childSWhere = "select top(10) HItemID,閮ㄩ棬浠ｇ爜,閮ㄩ棬鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (閮ㄩ棬浠ｇ爜 like '%" + value + "%' or 閮ㄩ棬鍚嶇О like '%" + value + "%') order by 閮ㄩ棬浠ｇ爜 desc";
+ childPage.getData(childSWhere, tableView);
+ //===================================================================================================================================
+ }, 200);
+ }
+ , end: function () {
+ childPage = null;
+ currRowIndex = 0;
+ if (childData != null) {
+ //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+ //鑾峰彇鏁版嵁
+ $("#HDeptID").val(childData.HItemID);//杞﹂棿id
+ $("#DeptNAME").val(childData.閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
+ //===============================================================================================================================
+
+ childData = null;
+ }
+ }
+ });
+ } else {
+ setTimeout(function () {
+ //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+ var value = $("#DeptNAME").val().replace(/'/g, ""); //鑾峰彇鏂囨湰妗嗘渶鏂板��
+ currRowIndex = 0;
+ var tableView = "h_v_Gy_DepartmentList";
+ var childSWhere = "select top(10) HItemID,閮ㄩ棬浠ｇ爜,閮ㄩ棬鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (閮ㄩ棬浠ｇ爜 like '%" + value + "%' or 閮ㄩ棬鍚嶇О like '%" + value + "%') order by 閮ㄩ棬浠ｇ爜 desc";
+ childPage.getData(childSWhere, tableView);
+ //=================================================================================================================================
+ }, 200);
+ }
+ } else { //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙ｄ腑 閫変腑琛� 鐨勪綅缃�
+ if (event.key == "ArrowUp") {
+ currRowIndex--;
+ childPage.setSelectedRow(currRowIndex);
+ } else if (event.key == "ArrowDown") {
+ currRowIndex++;
+ childPage.setSelectedRow(currRowIndex);
+ } else if (event.key == "Enter") {
+ //鎵嬪姩澶辩劍
+ var element = document.getElementById("HMaterNumber");
+ element.blur();
+
+ childPage.getSelectedData(currRowIndex);
+
+ if (childData != null) {
+ //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+ //鑾峰彇鏁版嵁
+ $("#HDeptID").val(childData.HItemID);//杞﹂棿id
+ $("#DeptNAME").val(childData.閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
+ //===============================================================================================================================
+
+ childData = null;
+ }
+
+
+ childPage = null;
+ currRowIndex = 0;
+ childData = null;
+ }
+ }
+ });
+ //#endregion
+ });
+ //#endregion
+
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鍒濆鍖栨棩鏈�
+ $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+ $("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//鑷�
//鐢熶骇缁勭粐鍔犺浇
Organ();
//鍒濆鍖栬〃鏍�
@@ -271,41 +466,46 @@
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: false
+ , page: true
, cellMinWidth: 90
, totalRow: true
- , limit: 20000
- , limits: [50, 500, 5000, 20000]
- , loading: false
+ , limit: 50
+ , limits: [50, 500,1000, 5000]
+ //, loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120, sort: true, filter: true }
+ , { field: '鐢熶骇杞﹂棿鍚嶇О', title: '鐢熶骇杞﹂棿鍚嶇О', sort: true, filter: true }
+ , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О', width: 100, sort: true, filter: true }
+ , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', sort: true, filter: true }
+ , { field: '瀹㈡埛璁㈠崟鍙�', title: '瀹㈡埛璁㈠崟鍙�', sort: true, filter: true }
+ , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', sort: true, filter: true }
+ , { field: 'FCOLUMN9', title: '鐢靛帇/鍔熺巼/搴曟澘', sort: true, filter: true }
+ , { field: '璁㈠崟浜ゆ湡', title: '璁㈠崟浜ゆ湡', templet: "<div>{{d.璁㈠崟浜ゆ湡 ==null ?'':layui.util.toDateString(d.璁㈠崟浜ゆ湡, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } }
+ , { field: '浜у搧缂栫爜', title: '浜у搧缂栫爜', sort: true, filter: true }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sort: true, filter: true }
+ , { field: '浜у搧瑙勬牸鍨嬪彿', title: '浜у搧瑙勬牸鍨嬪彿', sort: true, filter: true }
+ , { field: '鏃ヨ鍒掓棩鏈�', title: '鏃ヨ鍒掓棩鏈�', templet: "<div>{{d.鏃ヨ鍒掓棩鏈� ==null ?'':layui.util.toDateString(d.鏃ヨ鍒掓棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } }
+ , { field: '鏃ヨ鍒掓暟閲�', title: '鏃ヨ鍒掓暟閲�', sort: true, totalRow: true, filter: true }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', sort: true, filter: true }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true, filter: true }
+ , { field: '鐗╂枡瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸鍨嬪彿', sort: true, filter: true }
+ , { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺', sort: true, filter: true }
+ , { field: '渚涜揣杞﹂棿浠ｇ爜', title: '渚涜揣杞﹂棿浠ｇ爜', sort: true, filter: true }
+ , { field: '渚涜揣杞﹂棿', title: '渚涜揣杞﹂棿', sort: true, filter: true }
+ , { field: '鐗╂枡灞炴��', title: '鐗╂枡灞炴��', sort: true, filter: true }
+ , { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', sort: true, totalRow: true, filter: true }
+ , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', sort: true, totalRow: true, filter: true }
+ , { field: '缂烘枡鏁伴噺', title: '缂烘枡鏁伴噺', sort: true, totalRow: true, filter: true }
+ , { field: '鍙敤鏁伴噺', title: '鍙敤鏁伴噺', sort: true, totalRow: true, filter: true }
+ , { field: '鍗虫椂搴撳瓨鏁伴噺', title: '鍗虫椂搴撳瓨鏁伴噺', sort: true, totalRow: true, filter: true }
+ , { field: '鍗犵敤鏁伴噺', title: '鍗犵敤鏁伴噺', sort: true, totalRow: true, filter: true }
+ , { field: '棰嗙敤鍗犵敤鏁伴噺', title: '棰嗙敤鍗犵敤鏁伴噺', sort: true, totalRow: true, filter: true }
+ , { field: '鏈夋棤閲囪喘璁㈠崟', title: '鏈夋棤閲囪喘璁㈠崟', sort: true, filter: true }
+ ]]
, done: function (res, curr, count) {
soulTable.render(this);
}
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120, sort: true }
- , { field: '鐢熶骇杞﹂棿鍚嶇О', title: '鐢熶骇杞﹂棿鍚嶇О', sort: true }
- , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О', width: 100, sort: true }
- , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', sort: true }
- , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', sort: true }
- , { field: 'FCOLUMN9', title: '鐢靛帇/鍔熺巼/搴曟澘', sort: true }
- , { field: '璁㈠崟浜ゆ湡', title: '璁㈠崟浜ゆ湡', templet: "<div>{{d.璁㈠崟浜ゆ湡 ==null ?'':layui.util.toDateString(d.璁㈠崟浜ゆ湡, 'yyyy-MM-dd')}}</div>", sort: true }
- , { field: '浜у搧缂栫爜', title: '浜у搧缂栫爜', sort: true }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sort: true }
- , { field: '浜у搧瑙勬牸鍨嬪彿', title: '浜у搧瑙勬牸鍨嬪彿', sort: true }
- , { field: '鏃ヨ鍒掓棩鏈�', title: '鏃ヨ鍒掓棩鏈�', templet: "<div>{{d.鏃ヨ鍒掓棩鏈� ==null ?'':layui.util.toDateString(d.鏃ヨ鍒掓棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true }
- , { field: '鏃ヨ鍒掓暟閲�', title: '鏃ヨ鍒掓暟閲�', sort: true, totalRow: true}
- , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', sort: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
- , { field: '鐗╂枡瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸鍨嬪彿', sort: true }
- , { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', sort: true, totalRow: true }
- , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', sort: true, totalRow: true}
- , { field: '缂烘枡鏁伴噺', title: '缂烘枡鏁伴噺', sort: true, totalRow: true }
- , { field: '鍙敤鏁伴噺', title: '鍙敤鏁伴噺', sort: true, totalRow: true }
- , { field: '鍗虫椂搴撳瓨鏁伴噺', title: '鍗虫椂搴撳瓨鏁伴噺', sort: true, totalRow: true }
- , { field: '鍗犵敤鏁伴噺', title: '鍗犵敤鏁伴噺', sort: true, totalRow: true }
- , { field: '棰嗙敤鍗犵敤鏁伴噺', title: '棰嗙敤鍗犵敤鏁伴噺', sort: true, totalRow: true}
- , { field: '鏈夋棤閲囪喘璁㈠崟', title: '鏈夋棤閲囪喘璁㈠崟', sort: true }
- ]]
};
}
//#endregion
@@ -338,11 +538,14 @@
$.ajax({
url: GetWEBURL() + '/JIT_Complete/ReportMOMaterReadysBillList',
type: "GET",
- data: { "sWhere": sWhere },//, "user": sessionStorage["HUserName"]
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },//, "user": sessionStorage["HUserName"]
success: function (result) {
if (result.count == 1) {
option.data = result.data;
table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -367,7 +570,10 @@
var HSCZYID = $("#HSCZYID").val();//鐢熶骇璧勬簮
var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
var HMOBILLNO = $("#HMOBILLNO").val();//鐢熶骇璁㈠崟鍙�
-
+ var HBeginDate = $("#HBeginDate").val();//鎻愭枡鏃ユ湡
+ var HEndDate = $("#HEndDate").val();//鑷�
+ var HMaterAtt = $("#HMaterAtt").val();//鐗╂枡灞炴��
+
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -442,6 +648,16 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
+
+ if (HBeginDate > HEndDate) {
+ layer.close(ajaxLoad);
+ return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
+ }
+
+ if (HBeginDate != null && HEndDate != null) {
+ sWhere += " and HDate between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
+ }
+
sWhere = {
HORGID: HORGID
, HMATERIALID: HMATERIALID
@@ -449,18 +665,18 @@
, HSCZYID: HSCZYID
, HXQD: HXQD
, HMOBILLNO: HMOBILLNO
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HMaterAtt: HMaterAtt
}
-
+
$.ajax({
url: GetWEBURL() + '/JIT_Complete/ReportMOMaterReadysBillList',
type: "GET",
- data: { "sWhere": JSON.stringify(sWhere) },//, "user": sessionStorage["HUserName"]
+ data: { "sWhere": JSON.stringify(sWhere), "user": sessionStorage["HUserName"] },//, "user": sessionStorage["HUserName"]
success: function (result) {
if (result.count == 1) {
data = result.data;
-
- option.data = data;
- ins = table.render(option);
data.forEach((item) => {
for (let itemobj in item) {
@@ -469,11 +685,12 @@
}
if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
}
}
});
- table.exportFile(ins.config.id, data, "xls");
+ table.exportFile('mainTable', data, "xls");
layer.close(ajaxLoad);
} else {
@@ -504,6 +721,9 @@
var HSCZYID = $("#HSCZYID").val();//鐢熶骇璧勬簮
var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
var HMOBILLNO = $("#HMOBILLNO").val();//鐢熶骇璁㈠崟鍙�
+ var HBeginDate = $("#HBeginDate").val();//鎻愭枡鏃ユ湡
+ var HEndDate = $("#HEndDate").val();//鑷�
+ var HMaterAtt = $("#HMaterAtt").val();//鐗╂枡灞炴��
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -579,6 +799,15 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
+
+ if (HBeginDate > HEndDate) {
+ return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
+ }
+
+ if (HBeginDate != null && HEndDate != null) {
+ sWhere += " and HDate between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
+ }
+
sWhere = {
HORGID: HORGID
, HMATERIALID: HMATERIALID
@@ -586,6 +815,9 @@
, HSCZYID: HSCZYID
, HXQD: HXQD
, HMOBILLNO: HMOBILLNO
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HMaterAtt: HMaterAtt
}
get_Display(JSON.stringify(sWhere));
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -612,6 +844,9 @@
$("#ColContent2").val("");
$("#ColName2").val("0");
$("#Comparator2").val("0");
+ $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+ $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
+ $("#HMaterAtt").val("");
form.render('select');
sWhere = "";
}
@@ -709,6 +944,157 @@
form.render('select');
}
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [7,30, 45, 60];
+ var titleList = ["杩�7澶�","杩戜竴鏈�", "杩�45澶�", "杩�60澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("30");
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ titleData = [];
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
--
Gitblit v1.9.1