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/计划管理/工艺路线/Gy_RoutingBillListQuery.html | 565 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 464 insertions(+), 101 deletions(-)
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
index d5a8404..e05f664 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
@@ -13,6 +13,9 @@
<script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
<script src="../../../layuiadmin/pubcustom.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -28,35 +31,41 @@
</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">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
</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;">
- <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </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>
- <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>
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
- <!--鍏朵粬鏉′欢-->
+ <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;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 50%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 107px;">
@@ -69,6 +78,28 @@
<input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+ <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;">椤圭洰鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" style="display:none;" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
@@ -99,6 +130,61 @@
<input type="text" class="layui-input" 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="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>
</div>
@@ -118,18 +204,20 @@
</div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <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_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></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="get_Exit"><i class="layui-icon layui-icon-logout"></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" style="display:none;" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
</div>
</script>
<script type="text/html" id="toolbarDemo2">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_HideColumn2" id="get_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</form>
@@ -143,7 +231,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
@@ -154,6 +242,7 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , soulTable = layui.soulTable
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var option = [];
@@ -162,15 +251,36 @@
var titleData = ["hmainid", "鍗曟嵁绫诲瀷", "HMaterID", "hunitid", "HOrgID", "HMainCenterID", "宸ヤ綔", "HMainProcID", "宸ュ簭鍚嶇О", "涓昏繍琛屾椂闂�", "杩愯鏃堕棿鍗曚綅", "涓诲姞宸ユ暟閲�", "鏉愯川", "鍥惧彿鐗堟湰", "HMainGroupID", "鐝粍", "宸ヤ环", "鏍囧噯璧勬簮鏁�", "鍔犺祫婧愬閲�", "鍑忚祫婧愬噺閲�", "HItemID", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData2 = ["hmainid", "hsubid", "绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "宸ユ", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "绱鑹巼", "瓒呴姣斾緥", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "鍔犲伐鍗曚环", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ var HMaterID = "";
+ var HProID = 0;
+ var params = getUrlVars();
+ if (params[params[0]] != "undefined") {
+ HMaterID = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇
+ HProID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇
+ }
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
-
+
//鍒濆鍖栫晫闈�
set_ClearBill();
//鍒濆鍖栬〃鏍�
- DisPlay_HideColumn();
+ //DisPlay_HideColumn();
//#endregion
@@ -200,8 +310,17 @@
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ get_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
break;
};
});
@@ -259,15 +378,52 @@
}
})
}
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ 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);
+ }
+ });
+
+ //#endregion
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
Organ();
+ //鏌ヨ椤圭洰鍙�
+ Get_HProject();
//鏌ヨ
get_FastQuery(1);
+
}
//#endregion
@@ -278,75 +434,36 @@
, height: 550
, page: true
//, cellMinWidth: 90
+ , totalRow: true
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- /* { field: 'hmainid', title: 'hmainid', width: 110 }*/
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
- , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
- //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓' }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- , { field: '缁勭粐', title: '缁勭粐' }
- //, { field: 'hsubid', title: 'hsubid', width: 80 }
- , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
- , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
- //, { field: 'hprocid', title: 'hprocid', width: 105 }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭', title: '宸ュ簭' }
- //, { field: 'HSupID', title: 'HSupID', width: 105 }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
- , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О', width: 115 }
- , { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
- , { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
- , { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
- , { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
- , { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
- , { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
- , { field: '鑹巼', title: '鑹巼' }
- , { field: '绱鑹巼', title: '绱鑹巼' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 195 }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 180 }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 180 }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- //, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
- //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
- //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
- //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
- , { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
- //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
- , { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭', width: 150 }
- , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
- ]]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
};
}
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#WorkCenter").val("");//鍗曟嵁鍙�
$("#HMaterID").val(0);//鐗╂枡
$("#HMaterName").val("");//鐗╂枡
$("#HMaterNumber").val("");//鐗╂枡
$("#HModel").val("");//鐗╂枡
$("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#HProject").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");s
$("#HOrgID").val(sessionStorage["OrganizationID"]);
form.render('select');
$("#btnSearch").click();
@@ -354,6 +471,49 @@
}
//#endregion
+
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+ 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("29");
+ }
+ //#endregion
+
+ //#region 鑾峰彇椤圭洰鍙�
+ function Get_HProject() {
+ //鑾峰彇椤圭洰鍙�
+ var HProjectList = '<option value="0" style="color:red;" selected></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Material/Get_HProject",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ }
+ $("#HProject").append(HProjectList);
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
//鐗╂枡
function get_btnHMaterID() {
@@ -364,7 +524,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -375,12 +535,41 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HMaterID").val(checkStatus.data[0].HItemID);
- $("#HMaterName").val(checkStatus.data[0].HName);
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
})
}
+ //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+ //鍗曟嵁鍙疯秴閾炬帴
+ if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ //#endregion
//#region 鏌ヨ
function get_Display(sWhere) {
@@ -395,6 +584,7 @@
if (data1.count == 1) {
var data = [];
var col = [];
+ var totalArray = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
@@ -405,22 +595,55 @@
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
}
else {
switch (data[i].Type) {
//int
case 'DateTime':
- 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: 120 });
+ 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>"});
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
}
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 800
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
}
}
option.cols = [col];
option.data = data1.data;
- table.render(option);
+ ins = table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
layer.close(ajaxLoad);
+
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
@@ -470,6 +693,13 @@
case 'DateTime':
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;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
}
@@ -482,15 +712,23 @@
, toolbar: '#toolbarDemo2'
, cols: [col]
, data: data1.data
+ , totalRow: true
, height: 550
, page: true
//, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
}
table.render(option2);
layer.close(wait);
+
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
+
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(wait);
@@ -504,9 +742,33 @@
});
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ //table.on('row(mainTable)', function (obj) {
+ // //閫変腑琛屾敼鍙橀鑹�
+ // 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.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ // } else {
+ // obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ // $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ // }
+ // //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ // layui.each(table.cache.mainTable, function (i, l) {
+ // if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ // l.LAY_CHECKED = flag;
+ // }
+ // });
+ //})
+ //#endregion
+
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HOrgID = "";
+ var HProject = $("#HProject").val();
var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
//var HMaterID = $("#HMaterID").val();
var HMaterName = $("#HMaterName").val();
@@ -516,6 +778,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 = "";
@@ -539,7 +807,62 @@
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 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+
+ if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
+ //浠庡埆鐨勯〉闈㈡墦寮�浼犲叆Hmaterid鍊硷紝璁剧疆鐗╂枡杩囨护,鏈叧闂�
+ sWhere += " and HMaterID = " + HMaterID + " and isnull(瀹℃牳浜�,'''')<>'''' ";
+ } else {
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+ }
+
if (number == 1) {
HOrgID = sessionStorage["OrganizationID"];
}
@@ -565,8 +888,37 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
+ if (number==2) {
+ if (HProject) {
+ sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
+ }
+ }
+
+ sWhere += " and HBillSubType<>'SUB' ";
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Gy_RoutingBillListQuery_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
@@ -578,7 +930,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=3301&linteridSub=-1'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -601,7 +953,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -625,7 +977,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
type: "GET",
- data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
@@ -668,7 +1020,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3301'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -720,7 +1072,7 @@
})
}
- //#region 鏄庣粏 闅愯棌鍒楄缃�
+ //#region 鏄庣粏 闅愯棌鍒楄缃�
function get_HideColumn2() {
var colName = "";
var contentUrl = "";
@@ -768,7 +1120,8 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-
+ var titleData = ["hmainid", "鍗曟嵁绫诲瀷", "HMaterID", "hunitid", "HOrgID", "HMainCenterID", "宸ヤ綔", "HMainProcID", "宸ュ簭鍚嶇О", "涓昏繍琛屾椂闂�", "杩愯鏃堕棿鍗曚綅", "涓诲姞宸ユ暟閲�", "鏉愯川", "鍥惧彿鐗堟湰", "HMainGroupID", "鐝粍", "宸ヤ环", "鏍囧噯璧勬簮鏁�", "鍔犺祫婧愬閲�", "鍑忚祫婧愬噺閲�", "HItemID", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ // var titleData2 = ["hmainid", "hsubid", "绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "宸ユ", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "绱鑹巼", "瓒呴姣斾緥", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "鍔犲伐鍗曚环", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
for (var i = 1; i < option.cols[0].length - 1; i++) {
@@ -833,6 +1186,9 @@
} else {
table.render(option);
}
+
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
@@ -932,7 +1288,9 @@
}
}
$("#ColName").empty();
- $("#ColName").append(Organization);
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
@@ -941,7 +1299,12 @@
//浠ヤ笂鏄痩ayui妯″潡
});
-
+ //鐗╂枡
+ function GetMaterValue(obj) {
+ $("#HMaterID").val(obj[0].HItemID);
+ $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
+ }
</script>
--
Gitblit v1.9.1