From 478e80d0100eb887a2f87e84b7d7feb1ea0e51a5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 10 一月 2024 10:25:15 +0800
Subject: [PATCH] 采购订单列表快速过滤
---
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 34 +
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 3
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 4
WebTM/views/系统管理/过滤方案设置/Xt_FastICScheme.html | 201 +++++++++++
WebTM/views/系统管理/过滤方案设置/Xt_FastICSchemeList.html | 485 ++++++++++++++++++++++++++++
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 6
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 243 +++++++++----
WebTM/WebTM.csproj | 2
8 files changed, 885 insertions(+), 93 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e3aef0e..5010853 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -372,6 +372,8 @@
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserProcess_Excel.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserSuplies_Excel.html" />
<Content Include="views\绯荤粺绠＄悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
+ <Content Include="views\绯荤粺绠＄悊\杩囨护鏂规璁剧疆\Xt_FastICScheme.html" />
+ <Content Include="views\绯荤粺绠＄悊\杩囨护鏂规璁剧疆\Xt_FastICSchemeList.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_Tmp.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill_ChangeMater.html" />
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 4de5ebe..3fbe19e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -33,13 +33,13 @@
<div class="layui-inline">
<label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HModel" id="HModel">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HModel" id="HModel">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">涓氬姟鐘舵��</label>
<div class="layui-input-block">
- <select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
+ <select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
<!-- <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
<option value="寮�宸�">寮�宸�</option>
<option value="璁″垝">璁″垝</option>
@@ -56,7 +56,7 @@
<div class="layui-inline">
<label class="layui-form-label">鏄惁涓嬫帹鐢熸垚娴佽浆鍗�</label>
<div class="layui-input-block" style="margin-top:10px">
- <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
+ <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
<!-- <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
<option value="鍏ㄩ儴" selected="selected">鍏ㄩ儴</option>
<option value="宸蹭笅鎺�">宸蹭笅鎺�</option>
@@ -69,13 +69,13 @@
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐢熶骇杞﹂棿</label>
<div class="layui-input-block">
- <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
<!--鍔ㄦ�佹覆鏌撹溅闂�-->
</select>
@@ -84,7 +84,7 @@
<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">
+ <input type="text" class="layui-input ForFilteringSchemes" name="WorkCenter" id="WorkCenter">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" style="display:none;" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -97,14 +97,14 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillType" id="HBillType">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillType" id="HBillType">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍞竴ID</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HERPID" id="HERPID">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HERPID" id="HERPID">
</div>
</div>
</div>
@@ -112,12 +112,12 @@
<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;">
+ <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" 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>
@@ -132,14 +132,14 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" 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">
- <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
@@ -147,13 +147,13 @@
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate1">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
</div>
</div>
</div>
@@ -210,6 +210,8 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Remark" id="set_Remark"><i class="layui-icon layui-icon-form"></i>鍖呰澶囨敞</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
</form>
@@ -227,7 +229,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 () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -248,6 +250,7 @@
var option = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HDefaultFilter = "";
//鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
@@ -388,7 +391,13 @@
//鍖呰澶囨敞
case 'set_Remark': set_Remark();
break;
- };
+ //淇濆瓨鏂规
+ case 'set_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'set_ReadScheme': set_ReadScheme();
+ break;
+ };
});
//閲嶆柊鍚屾鎸夐挳
@@ -446,7 +455,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
-
+
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
@@ -517,7 +526,7 @@
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true }
, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', hide: true }
- , { field: '璁㈠崟鍖呰澶囨敞', title: '璁㈠崟鍖呰澶囨敞', hide: true}
+ , { field: '璁㈠崟鍖呰澶囨敞', title: '璁㈠崟鍖呰澶囨敞', hide: true }
]]
};
@@ -540,44 +549,44 @@
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: 'HEntryID', title: 'HEntryID', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true}
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', sort: true}
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sort: true}
- , { field: '瀹㈡埛', title: '瀹㈡埛', sort: true}
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', sort: true}
- , { field: 'HWidth', title: '闂ㄥ箙', sort: true}
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true}
- , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', totalRow: true, sort: true}
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true}
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', sort: true }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sort: true }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', sort: true }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', sort: true }
+ , { field: 'HWidth', title: '闂ㄥ箙', sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
+ , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', totalRow: true, sort: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
, { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true }
, { field: '鏄惁鍙栧簱瀛�', title: '鏄惁鍙栧簱瀛�', sort: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true}
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true}
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true }
, { field: '鐘舵��', title: '鐘舵��', sort: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
- , { field: 'HAuxQty', title: '杈呮暟閲�', sort: true}
- , { field: 'HAuxUnitName', title: '杈呭姪鍗曚綅', sort: true}
- , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', sort: true}
- , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', sort: true}
- , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', sort: true}
- , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', sort: true}
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true}
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true}
- , { field: '淇敼浜�', title: '淇敼浜�', sort: true}
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true}
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true}
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true}
+ , { field: 'HAuxQty', title: '杈呮暟閲�', sort: true }
+ , { field: 'HAuxUnitName', title: '杈呭姪鍗曚綅', sort: true }
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', sort: true }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', sort: true }
+ , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', sort: true }
+ , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', sort: true }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true }
+ , { field: '淇敼浜�', title: '淇敼浜�', sort: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true }
, { field: '鍞竴ID', title: '鍞竴ID', sort: true, }
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', sort: true}
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', sort: true}
- , { field: '鍖呰鏍囪瘑浠ｇ爜', title: '鍖呰鏍囪瘑浠ｇ爜', sort: true}
- , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', sort: true}
- , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', sort: true}
- , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺', sort: true}
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true}
- , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�', sort: true}
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true}
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', sort: true }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', sort: true }
+ , { field: '鍖呰鏍囪瘑浠ｇ爜', title: '鍖呰鏍囪瘑浠ｇ爜', sort: true }
+ , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', sort: true }
+ , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', sort: true }
+ , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺', sort: true }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true }
+ , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�', sort: true }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
//, { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true }
//, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', hide: true }
//, { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120, hide: true }
@@ -604,9 +613,9 @@
//, { field: 'hbomid', title: 'hbomid' , hide: true}
//, { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�', hide: true }
//, { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
- , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜', sort: true}
+ , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜', sort: true }
, { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎', sort: true }
- , { field: '璁㈠崟鍖呰澶囨敞', title: '璁㈠崟鍖呰澶囨敞', sort: true, width: 150}
+ , { field: '璁㈠崟鍖呰澶囨敞', title: '璁㈠崟鍖呰澶囨敞', sort: true, width: 150 }
//, { field: 'hsubid', title: 'hsubid' , hide: true}
//, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', hide: true}
//, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', hide: true}
@@ -980,33 +989,113 @@
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
var HEntryID = data[0].hsubid.toString();
- layer.prompt({ formType: 2, title: "璇疯緭鍏ヨ鍗曞寘瑁呭娉�", value: '' },
- function (value, index) {
- layer.close(index);
- var HOrderPickRemark = value;
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "Sc_ICMOBill/ICMOBillSaveRemark",
- type: "GET",
- data: {
- "HInterID": linterid
- , "HEntryID": HEntryID
- , "HOrderPickRemark": HOrderPickRemark
- },
- success: function (data1) {
- //鍒锋柊椤甸潰,
- $("#btnSearch").trigger('click');
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
- }, error: function () {
- layer.close(index);
- layer.msg("閿欒");
- }
- });
- });
+ layer.prompt({ formType: 2, title: "璇疯緭鍏ヨ鍗曞寘瑁呭娉�", value: '' },
+ function (value, index) {
+ layer.close(index);
+ var HOrderPickRemark = value;
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "Sc_ICMOBill/ICMOBillSaveRemark",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ , "HEntryID": HEntryID
+ , "HOrderPickRemark": HOrderPickRemark
+ },
+ success: function (data1) {
+ //鍒锋柊椤甸潰,
+ $("#btnSearch").trigger('click');
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }, error: function () {
+ layer.close(index);
+ layer.msg("閿欒");
+ }
+ });
+ });
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var Filter = document.getElementsByClassName("ForFilteringSchemes"); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //瀵规暟缁勮繘琛岀紪鐮�
+ HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//瀵� URI 杩涜缂栫爜
+ HValue = encodeURI(HValue.substring(0, HValue.length - 1));//瀵� URI 杩涜缂栫爜
+ HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//瀵� URI 杩涜缂栫爜
+
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=閲囪喘璁㈠崟&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ , end: function () {
+ get_FastQuery()
+ }
+ })
+ }
+ ;
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=HFilterScheme'
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ , end: function () {
+ get_FastQuery()
+ }
+ })
}
// 澶嶅埗
@@ -1356,7 +1445,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎","璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 18b9cbc..bd830a4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -633,18 +633,30 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.confirm(data.Message, {
- btn: ['纭']
- }, function (index) {
- if (data.Verify == "Y") //鑷姩瀹℃牳
- {
- layer.close(index);
- SaveVerify(); //瀹℃牳
- }
- else {
- layer.close(index);
- }
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ //layer.close(layer.index);
+ //window.parent.location.reload();
});
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
+ //layer.confirm(data.Message, {
+ // btn: ['纭']
+ //}, function (index) {
+ // if (data.Verify == "Y") //鑷姩瀹℃牳
+ // {
+ // layer.close(index);
+ // SaveVerify(); //瀹℃牳
+ // }
+ // else {
+ // layer.close(index);
+ // }
+ //});
}
else {
layer.alert(data.Message, { icon: 5 })
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html"
new file mode 100644
index 0000000..3a905f8
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html"
@@ -0,0 +1,201 @@
+锘�<!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">
+ <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;
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <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" style="margin-left:5px !important;">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <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="HName" lay-verify="HName" id="HName">
+ <input id="HInterID" name="HInterID" type="hidden" />
+ <input id="HUserCode" name="HUserCode" type="hidden" />
+ <input id="HCreateDate" name="HCreateDate" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">妯″潡鍚嶇О锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBillName" lay-verify="HBillName" id="HBillName" readonly>
+ </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>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">榛樿鏍囪</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HUseingFlag" id="HUseingFlag" lay-skin="primary" title="">
+ </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="">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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/zgqCustom/zgqCustom.js"></script>
+ <script>
+ //鑾峰彇鍙傛暟
+ 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 params = getUrlVars();
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var HModuleName = params[params[1]];//妯″潡鍚嶇О
+ var HFilterIdLists = params[params[2]];//杩囨护鏉′欢ID
+ var HValue = params[params[3]];//杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ var HElement_type = params[params[4]];//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ //甯歌鐢ㄦ硶
+ HModuleName = getParams("HModuleName");
+ HFilterIdLists = getParams("HFilterIdLists");
+ HValue = getParams("HValue");
+ HElement_type = getParams("HElement_type");
+ $("#HBillName").val(HModuleName);
+
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return null;
+ };
+
+ if (OperationType == 1) {
+ $("#HInterID").val("");
+
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3332' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUserCode").val(sessionStorage["HUserName"]);
+ }
+ });
+ }
+ //#region 澶撮儴宸ュ叿鏍忎簨浠�
+
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ var isUseCheck = document.getElementById("HUseingFlag").checked;
+ var isStopCheck = document.getElementById("HStopflag").checked;
+ data.field.HUseingFlag = isUseCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ data.field.HStopflag = isStopCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ var oMain = JSON.stringify(data.field)
+
+ var sMainSub = oMain + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["HUserName"];
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function () {
+ Pub_Close(1);
+ })
+ //#endregion
+
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICSchemeList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICSchemeList.html"
new file mode 100644
index 0000000..08a3550
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICSchemeList.html"
@@ -0,0 +1,485 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; 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, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+
+ <form class="layui-form" action="" lay-filter="component-form-group">
+
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"> </table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btn-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var Organization = sessionStorage["Organization"]
+ var HModName = "Xt_FastICSchemeList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID"];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鏂板
+ case 'btnAdd': set_AddNew();
+ break;
+ //鍒犻櫎
+ case 'btndelete': set_DeleteBill();
+ break;
+ };
+ });
+
+ //琛岀洃鍚簨浠�
+ 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;
+ }
+ });
+ });
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ switch (Type) {
+ case "HAccCus": //杩斿洖缁撶畻鍗曚綅
+ parent.GetHAccCusValue(data);
+ break;
+ default:
+ parent.GetHSupValue(data); //杩斿洖 瀹㈡埛
+ }
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#region 閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
+ //#endregion
+ //#endregion
+
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //鍒濆鍖栭〉闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ //, cols: [[
+ // { type: 'radio', fixed: 'left' }
+ // , { field: '閫夋嫨', title: '閫夋嫨', sort: true, hide: true }
+ // , { field: 'HItemID', title: 'HItemID', hide: true }
+ // , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+ // , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
+ // , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
+ // , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
+ // , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
+ // , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+ //]]
+ };
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/list',
+ type: "GET",
+ data: { "user": sessionStorage["HUserName"], "HModuleName": "閲囪喘璁㈠崟" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // 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 {
+ 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ //蹇�熺瓫閫�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (HNumber) {
+ sWhere += " and 渚涘簲鍟嗕唬鐮� like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 渚涘簲鍟嗗悕绉� like '%" + HName + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ // 閲嶇疆鎸夐挳
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
+ }
+
+ // 鍒犻櫎鎸夐挳
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var ModRightNameDelete = "Gy_Supplier_Delete";
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Supplier/Delete_Json',
+ type: "GET",
+ //async: true,
+ data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+
+ //鏂板鎸夐挳
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板杩囨护鏂规',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+
+
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ 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.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) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ 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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ 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;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index b4b062b..02af6ba 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -1379,7 +1379,7 @@
rowdata.push(
{
"HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
- "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
+ "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
@@ -1395,7 +1395,7 @@
option.data = rowdata;
table.render(option);
for (let j = 0; j < data.length; j++) {
- $("#HResult" + (j + 1)).val(data[j].缁撹)
+ $("#HResult" + (j + 1)).val(data[j].缁撹 == "鍚堟牸" ? 1 : 2)
}
for (let j = 0; j < data.length; j++) {
$("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 24f68a7..a1bdc1c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -1493,7 +1493,7 @@
rowdata.push(
{
"HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
- "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
+ "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
@@ -1509,7 +1509,7 @@
option.data = rowdata;
table.render(option);
for (let j = 0; j < data.length; j++) {
- $("#HResult" + (j + 1)).val(data[j].缁撹)
+ $("#HResult" + (j + 1)).val(data[j].缁撹 == "鍚堟牸" ? 1 : 2)
}
for (let j = 0; j < data.length; j++) {
$("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
@@ -2076,7 +2076,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+
$("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].HName);
$("#HMaterID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index e024ee0..aa68c9b 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -102,7 +102,7 @@
<label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" readonly>
+ <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" >
<input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs2">
@@ -1015,6 +1015,7 @@
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HStockPlaceID").val(result.data[0].HItemID);
$("#HStockPlaceName").val(result.data[0].HName);
$("#HWHID").val(result.data[0].HWHID);
$("#HWHNAME").val(result.data[0].HWhName);
--
Gitblit v1.9.1